diff --git a/.github/actions/build.sh b/.github/actions/build.sh
new file mode 100644
index 000000000..83f3fef47
--- /dev/null
+++ b/.github/actions/build.sh
@@ -0,0 +1,4 @@
+if [[ $GIT_BRANCH -eq 'develop' ]]; then VERSION=dev-$VERSION; fi
+docker buildx build --push\
+    --tag zurdi15/romm:latest --tag zurdi15/romm:${VERSION}\
+    --platform linux/arm64,linux/amd64 . --file ./docker/Dockerfile
\ No newline at end of file
diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 0323d56ec..71a630580 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -3,14 +3,6 @@ name: build romm image
 on:
   workflow_dispatch:
     inputs:
-      env:
-        description: 'environment'
-        required: true
-        default: 'dev'
-        type: choice
-        options:
-        - dev
-        - pro
       version:
         description: 'romm version'
         required: true
@@ -22,6 +14,8 @@ jobs:
     steps:
       - name: checkout code
         uses: actions/checkout@v2
+      - name: Set environment variables
+        run: echo "GIT_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
       - name: install buildx
         id: buildx
         uses: crazy-max/ghaction-docker-buildx@v1
@@ -31,11 +25,6 @@ jobs:
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
       - name: build the image
         shell: bash
-        run: |
-          if [[ $ENV -eq 'dev' ]]; then VERSION=$ENV-$VERSION; fi
-          docker buildx build --push\
-            --tag zurdi15/romm:latest --tag zurdi15/romm:${VERSION}\
-            --platform linux/arm64,linux/amd64 . --file ./docker/Dockerfile
+        run: ./.github/scripts/build.sh
         env:
-          ENV: ${{ inputs.env }}
           VERSION: ${{ inputs.version }}
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7ce052ff7..263191f7c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -24,10 +24,10 @@ RUN pip install --no-cache-dir --upgrade -r ./requirements.txt
 COPY ./backend/src ./
 
 # setup init script and config files
-COPY ./docker/init_back /init_back
-COPY ./docker/init_front /init_front
-COPY ./docker/init /init
-COPY ./nginx/default.conf /etc/nginx/nginx.conf
+COPY ./docker/init_scripts/init_back /init_back
+COPY ./docker/init_scripts/init_front /init_front
+COPY ./docker/init_scripts/init /init
+COPY ./docker/nginx/default.conf /etc/nginx/nginx.conf
 
 EXPOSE 80
 
diff --git a/docker/init b/docker/init_scripts/init
similarity index 100%
rename from docker/init
rename to docker/init_scripts/init
diff --git a/docker/init_back b/docker/init_scripts/init_back
similarity index 100%
rename from docker/init_back
rename to docker/init_scripts/init_back
diff --git a/docker/init_front b/docker/init_scripts/init_front
similarity index 100%
rename from docker/init_front
rename to docker/init_scripts/init_front
diff --git a/nginx/default.conf b/docker/nginx/default.conf
similarity index 100%
rename from nginx/default.conf
rename to docker/nginx/default.conf