diff --git a/README.md b/README.md
index cc887c80..7f26a71f 100644
--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ You should now be able to visit `https://[ROUTE]`, where `[ROUTE]` is the route
 ### Secrets
 
 ips on managing
-[secrets](https://github.com/GSA/data.gov/wiki/Cloud.gov-Cheat-Sheet#secrets-management).
+[secrets](https://github.com/GSA/data.gov/wiki/cloud.gov#secrets-management).
 When creating the service for the first time, use `create-user-provided-service`
 instead of update.
 
diff --git a/ckan/setup/gunicorn.conf.py b/ckan/setup/gunicorn.conf.py
index d8fb2901..e1288d6e 100644
--- a/ckan/setup/gunicorn.conf.py
+++ b/ckan/setup/gunicorn.conf.py
@@ -1,4 +1,3 @@
-# gunicorn prior to version 20.1.0 discloses "server" header
-# https://github.com/GSA/data.gov/issues/2826
 import gunicorn
-gunicorn.SERVER_SOFTWARE = ''
+
+gunicorn.SERVER_SOFTWARE = ""
diff --git a/postgresql/Dockerfile b/postgresql/Dockerfile
index b53f8c15..ea9255cb 100644
--- a/postgresql/Dockerfile
+++ b/postgresql/Dockerfile
@@ -9,5 +9,3 @@ ARG DATASTORE_READONLY_PASSWORD
 
 # Include extra setup scripts (eg datastore)
 ADD docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
-ADD https://github.com/GSA/data.gov/raw/71936f004be1882a506362670b82c710c64ef796/ansible/roles/software/ec2/ansible/files/locations.sql.gz /docker-entrypoint-initdb.d/locations.sql.gz
-RUN chmod 666 /docker-entrypoint-initdb.d/locations.sql.gz
diff --git a/postgresql/docker-entrypoint-initdb.d/30_locations.sql.gz b/postgresql/docker-entrypoint-initdb.d/30_locations.sql.gz
new file mode 100644
index 00000000..433b7cbf
Binary files /dev/null and b/postgresql/docker-entrypoint-initdb.d/30_locations.sql.gz differ
diff --git a/solr/Dockerfile b/solr/Dockerfile
index 6ef08ace..62abadf7 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -20,7 +20,6 @@ RUN git clone https://github.com/aws/efs-utils && \
 # Install hostname resolution dependencies
 RUN apt-get install -y dnsutils
 
-# Fix Issue https://github.com/GSA/data.gov/issues/3285
 # Update the angularjs library files
 ADD https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.8.2/angular.min.js \
 https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.8.2/angular.js \
@@ -63,7 +62,6 @@ RUN sed -i 's/jquery-1.7.2.min.js/jquery-3.6.0.min.js/' \
     /opt/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
 
 
-# Fix Issue https://github.com/GSA/data.gov/issues/3283
 # Disable directory listing
 RUN perl -0777  -i -pe 's/ \
     <param-name>dirAllowed<\/param-name>\n.*<param-value>true<\/param-value>/ \