diff --git a/roles/fedora-web/build/files/sync-atomic-htaccess.cron b/roles/fedora-web/build/files/sync-atomic-htaccess.cron
deleted file mode 100644
index 15cc4d6df7..0000000000
--- a/roles/fedora-web/build/files/sync-atomic-htaccess.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-MAILTO=web-members@fedoraproject.org
-40 * * * * apache /usr/local/bin/lock-wrapper sync-atomic-htaccess /usr/local/bin/sync-atomic-htaccess.sh
diff --git a/roles/fedora-web/build/files/sync-atomic-htaccess.sh b/roles/fedora-web/build/files/sync-atomic-htaccess.sh
deleted file mode 100644
index d454351102..0000000000
--- a/roles/fedora-web/build/files/sync-atomic-htaccess.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -e
-cd /srv/web/atomic-htaccess-generator
-python /usr/local/bin/atomic-htaccess-generator.py
-# The . here is meaningful!
-cp -r out/. /srv/websites/getfedora.org/
diff --git a/roles/fedora-web/build/tasks/main.yml b/roles/fedora-web/build/tasks/main.yml
index 8aae15000c..a101ab5ff4 100644
--- a/roles/fedora-web/build/tasks/main.yml
+++ b/roles/fedora-web/build/tasks/main.yml
@@ -44,30 +44,14 @@
   - arm.fedoraproject.org
   - iot.fedoraproject.org
   - labs.fedoraproject.org
-  - atomic-htaccess-generator
-  - atomic-htaccess-generator/build
-  - atomic-htaccess-generator/out
   tags:
   - fedora-web
-  - atomic-htaccess-generator
 
 - name: make fmw dir
   file: state=directory path=/srv/web/fmw owner=apache group=sysadmin-releng mode=2775 setype=httpd_sys_content_t seuser=system_u
   tags:
   - fedora-web
 
-- name: Copy atomic-htaccess-generator.py
-  template: src=atomic-htaccess-generator.py dest=/usr/local/bin/atomic-htaccess-generator.py owner=root group=root mode=0755
-  tags:
-  - fedora-web
-  - atomic-htaccess-generator
-
-- name: Copy atomic-htaccess-generator.sh helper script
-  copy: src=sync-atomic-htaccess.sh dest=/usr/local/bin/sync-atomic-htaccess.sh owner=root group=root mode=0755
-  tags:
-  - fedora-web
-  - atomic-htaccess-generator
-
 - name: Copy syncStatic script (stg)
   when: env == "staging"
   copy: >
@@ -107,8 +91,6 @@
   with_items:
   - syncStatic
   - syncTranslations
-  - sync-atomic-htaccess
   tags:
   - fedora-web
   - cron
-  - atomic-htaccess-generator
diff --git a/roles/openshift-apps/websites/templates/build.sh b/roles/openshift-apps/websites/templates/build.sh
index aa94329fcf..659ab8f037 100644
--- a/roles/openshift-apps/websites/templates/build.sh
+++ b/roles/openshift-apps/websites/templates/build.sh
@@ -3,4 +3,6 @@ cd /tmp
 git clone --branch {% if env == "staging" %}staging{% else %}master{% endif %} https://pagure.io/fedora-web/websites.git
 cd websites
 git rev-parse HEAD
-exec ./build-prod.sh /output
+bash ./build-prod.sh /output
+python generate-htaccess.py
+mv out/. /output/
diff --git a/roles/openshift-apps/websites/templates/configmap.yml b/roles/openshift-apps/websites/templates/configmap.yml
index abd5ee6ecd..5b15f10dfd 100644
--- a/roles/openshift-apps/websites/templates/configmap.yml
+++ b/roles/openshift-apps/websites/templates/configmap.yml
@@ -9,3 +9,5 @@ metadata:
 data:
   build.sh: |-
     {{ load_file('build.sh') | indent() }}
+  generate-htaccess.py: |-
+    {{ load_file('generate-htaccess.py') | indent() }}
diff --git a/roles/fedora-web/build/templates/atomic-htaccess-generator.py b/roles/openshift-apps/websites/templates/generate-htaccess.py
similarity index 100%
rename from roles/fedora-web/build/templates/atomic-htaccess-generator.py
rename to roles/openshift-apps/websites/templates/generate-htaccess.py