diff --git a/.github/workflows/new-dev.yml b/.github/workflows/new-dev.yml
index 348dd9a..1fcec8d 100644
--- a/.github/workflows/new-dev.yml
+++ b/.github/workflows/new-dev.yml
@@ -36,9 +36,9 @@ jobs:
           context: .
           platforms: linux/amd64
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-amd64:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-amd64:buildcache
-          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-amd64:buildcache,mode=min
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:buildcache
+          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:buildcache,mode=min
       - name: Build BW autoconf for amd64
         uses: docker/build-push-action@v3
         with:
@@ -46,9 +46,9 @@ jobs:
           file: autoconf/Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-amd64:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-amd64:buildcache
-          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-amd64:buildcache,mode=min
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:buildcache
+          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:buildcache,mode=min
       - name: Build BW UI for amd64
         uses: docker/build-push-action@v3
         with:
@@ -57,8 +57,8 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-ui-tests-amd64:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-ui-tests-amd64:buildcache
-          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-ui-tests-amd64:buildcache,mode=min
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:buildcache
+          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:buildcache,mode=min
 
   # Build bunkerweb/386
   build-bw-386:
@@ -89,9 +89,9 @@ jobs:
           context: .
           platforms: linux/386
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-386:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-386:buildcache
-          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-386:buildcache,mode=min
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-386:latest
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-386:buildcache
+          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-386:buildcache,mode=min
       - name: Build BW autoconf for 386
         uses: docker/build-push-action@v3
         with:
@@ -99,9 +99,9 @@ jobs:
           file: autoconf/Dockerfile
           platforms: linux/386
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-386:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-386:buildcache
-          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-386:buildcache,mode=min
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-386:latest
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-386:buildcache
+          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-386:buildcache,mode=min
       - name: Build BW UI for 386
         uses: docker/build-push-action@v3
         with:
@@ -109,9 +109,9 @@ jobs:
           file: ui/Dockerfile
           platforms: linux/386
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-386:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-386:buildcache
-          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-386:buildcache,mode=min
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-386:latest
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-386:buildcache
+          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-386:buildcache,mode=min
 
 
   # Build bunkerweb/arm
@@ -142,9 +142,9 @@ jobs:
           context: .
           platforms: linux/arm/v7,linux/arm64/v8
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-arm:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-arm:buildcache
-          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-arm:buildcache,mode=min
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-arm:latest
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-arm:buildcache
+          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-arm:buildcache,mode=min
       - name: Build BW autoconf for arm
         uses: docker/build-push-action@v3
         with:
@@ -152,9 +152,9 @@ jobs:
           file: autoconf/Dockerfile
           platforms: linux/arm/v7,linux/arm64/v8
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-arm:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-arm:buildcache
-          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-arm:buildcache,mode=min
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-arm:latest
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-arm:buildcache
+          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-arm:buildcache,mode=min
       - name: Build BW UI for arm
         uses: docker/build-push-action@v3
         with:
@@ -162,9 +162,9 @@ jobs:
           file: ui/Dockerfile
           platforms: linux/arm/v7,linux/arm64/v8
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-ui-tests-arm:latest
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-ui-tests-arm:buildcache
-          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-ui-tests-arm:buildcache,mode=min
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-arm:latest
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-arm:buildcache
+          cache-to: type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-arm:buildcache,mode=min
 
   # Run tests
   tests:
@@ -175,6 +175,17 @@ jobs:
       # Prepare
       - name: Checkout source code
         uses: actions/checkout@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
       - name: Set variables
         run: |
           VER=$(cat VERSION | tr -d '\n')
@@ -186,9 +197,9 @@ jobs:
     
       # Import images to local registry
       - name: Import BW image
-        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-amd64:latest 10.20.1.1:5000/bw-tests:latest && docker push 10.20.1.1:5000/bw-tests:latest
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest 10.20.1.1:5000/bw-tests:latest && docker push 10.20.1.1:5000/bw-tests:latest
       - name: Import BW autoconf image
-        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-amd64:latest 10.20.1.1:5000/bw-autoconf-tests:latest && docker push 10.20.1.1:5000/bw-autoconf-tests:latest
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest 10.20.1.1:5000/bw-autoconf-tests:latest && docker push 10.20.1.1:5000/bw-autoconf-tests:latest
 
       # Run tests
       - name: Run Docker tests
@@ -234,11 +245,11 @@ jobs:
           context: .
           platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb:staging,bunkerity/bunkerweb:dev
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:staging,bunkerity/bunkerweb:dev
           cache-from: |
-            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-amd64:buildcache
-            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-386:buildcache
-            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-tests-arm:buildcache
+            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:buildcache
+            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-386:buildcache
+            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-arm:buildcache
       - name: Build and push BW autoconf
         uses: docker/build-push-action@v3
         with:
@@ -246,11 +257,11 @@ jobs:
           file: autoconf/Dockerfile
           platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf:staging,bunkerity/bunkerweb-autoconf:dev
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:staging,bunkerity/bunkerweb-autoconf:dev
           cache-from: |
-            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-amd64:buildcache
-            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-386:buildcache
-            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-autoconf-tests-arm:buildcache
+            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:buildcache
+            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-386:buildcache
+            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-arm:buildcache
       - name: Build and push BW UI
         uses: docker/build-push-action@v3
         with:
@@ -258,11 +269,11 @@ jobs:
           file: ui/Dockerfile
           platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
           push: true
-          tags: ${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-ui:staging,bunkerity/bunkerweb-ui:dev
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:staging,bunkerity/bunkerweb-ui:dev
           cache-from: |
-            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-ui-tests-amd64:buildcache
-            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-ui-tests-386:buildcache
-            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/bunkerweb-ui-tests-arm:buildcache
+            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:buildcache
+            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-386:buildcache
+            type=registry,ref=${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-arm:buildcache
 
   # Push to PackageCloud
   push-linux: