diff --git a/.github/workflows/build-base-image.yml b/.github/workflows/build-base-image.yml
index 3eb63e1..b852c31 100644
--- a/.github/workflows/build-base-image.yml
+++ b/.github/workflows/build-base-image.yml
@@ -52,7 +52,7 @@ jobs:
       push: false
       target: base1
     secrets: inherit
-  
+
   build-base2-image:
     name: Build Base2 Image
     needs:
@@ -75,17 +75,6 @@ jobs:
     with:
       project_name: ${{ needs.prepare-environment.outputs.project_name }}
       project_version: ${{ needs.prepare-environment.outputs.project_version }}
-      push: false
+      push: true
       target: base3
     secrets: inherit
-
-  build-development-image:
-    name: Build Development Image
-    needs:
-      - prepare-environment
-      - build-base3-image
-    uses: ./.github/workflows/build-image.yml
-    with:
-      project_name: ${{ needs.prepare-environment.outputs.project_name }}
-      project_version: ${{ needs.prepare-environment.outputs.project_version }}
-    secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index d28cf9f..1dd57d2 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -1,6 +1,6 @@
 # Apache License 2.0
 
-name: Build Image
+name: Build Development Image
 
 on:
   workflow_call:
@@ -65,4 +65,4 @@ jobs:
           cache-to: type=gha,mode=max
           target: ${{ inputs.target }}
           platforms: linux/amd64,linux/arm64
-          push: ${{ inputs.push }}
\ No newline at end of file
+          push: ${{ inputs.push }}
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index a8a1de4..9409d2e 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -38,7 +38,7 @@ jobs:
           lfs: true
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-        if: matrix.architecture == 'arm64'
+        if: matrix.architecture == 'arm64' && github.event_name == 'push' && github.ref == 'refs/heads/main'
         with:
           platforms: arm64
       - name: Login to DockerHub
@@ -70,7 +70,7 @@ jobs:
           lfs: true
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-        if: matrix.architecture == 'arm64'
+        if: matrix.architecture == 'arm64' && github.event_name == 'push' && github.ref == 'refs/heads/main'
         with:
           platforms: arm64
       - name: Login to DockerHub
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 058bca5..703c75c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -70,7 +70,7 @@ jobs:
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: packages/python/
+          packages-dir: packages/python/
 
   deploy-documentation:
     name: Deploy Documentation
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 8c2dce8..cfe8248 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -219,8 +219,6 @@ RUN mkdir /tmp/openssl \
  && mv /usr/local/ssl/bin/openssl /usr/bin/openssl \
  && rm -rf /tmp/openssl
 
-FROM base3 as root-user
-
 ## Black
 
 RUN python3.11 -m pip install black black[jupyter]