diff --git a/.github/workflows/build-bunkerized-nginx-autoconf.yml b/.github/workflows/build-bunkerized-nginx-autoconf.yml
index 25886c8..262819b 100644
--- a/.github/workflows/build-bunkerized-nginx-autoconf.yml
+++ b/.github/workflows/build-bunkerized-nginx-autoconf.yml
@@ -52,7 +52,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build (dev)
+      - name: Build and push (dev)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/dev'
         with:
@@ -70,7 +70,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-      - name: Push (master)
+      - name: Build and push (master)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/master'
         with:
diff --git a/.github/workflows/build-bunkerized-nginx-ui.yml b/.github/workflows/build-bunkerized-nginx-ui.yml
index ff7b9d1..987e63d 100644
--- a/.github/workflows/build-bunkerized-nginx-ui.yml
+++ b/.github/workflows/build-bunkerized-nginx-ui.yml
@@ -52,7 +52,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build (dev)
+      - name: Build and push (dev)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/dev'
         with:
@@ -70,7 +70,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-      - name: Push (master)
+      - name: Build and push (master)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/master'
         with:
diff --git a/.github/workflows/build-bunkerized-nginx.yml b/.github/workflows/build-bunkerized-nginx.yml
index 92b47e6..625c530 100644
--- a/.github/workflows/build-bunkerized-nginx.yml
+++ b/.github/workflows/build-bunkerized-nginx.yml
@@ -55,7 +55,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build (dev)
+      - name: Build and push (dev)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/dev'
         with:
@@ -72,7 +72,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-      - name: Push (master)
+      - name: Build and push (master)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/master'
         with:
diff --git a/prepare.sh b/prepare.sh
index b2e0b85..7d1fca1 100644
--- a/prepare.sh
+++ b/prepare.sh
@@ -6,7 +6,7 @@ chown -R root:nginx /www
 chmod -R 770 /www
 
 # prepare /opt
-chown -R root:nginx /opt/bunkerized-nginx
+chown -R root:nginx /opt
 find /opt -type f -exec chmod 0740 {} \;
 find /opt -type d -exec chmod 0750 {} \;
 chmod ugo+x /opt/bunkerized-nginx/entrypoint/* /opt/bunkerized-nginx/scripts/*
@@ -15,11 +15,12 @@ chmod 770 /opt/bunkerized-nginx
 chmod 440 /opt/bunkerized-nginx/settings.json
 
 # prepare /etc/nginx
-for file in $(ls /etc/nginx) ; do
-	if [ -f /etc/nginx/$file ] && [ ! -f /opt/confs/global/$file ] ; then
-		cp /etc/nginx/$file /opt/confs/global
-	fi
-done
+# TODO : remove commented code if not needed
+#for file in $(ls /etc/nginx) ; do
+#	if [ -f /etc/nginx/$file ] && [ ! -f /opt/bunkerized-nginx/confs/global/$file ] ; then
+#		cp /etc/nginx/$file /opt/bunkerized-nginx/confs/global
+#	fi
+#done
 chown -R root:nginx /etc/nginx
 chmod -R 770 /etc/nginx