diff --git a/.github/workflows/application-build.yml b/.github/workflows/application-build.yml
index fd4b5626..5be7b795 100644
--- a/.github/workflows/application-build.yml
+++ b/.github/workflows/application-build.yml
@@ -1,6 +1,7 @@
 name: Build jars
 
 on:
+  workflow_dispatch:
   push:
     tags:
       - "extender-v[0-9]+.[0-9]+.[0-9]+"
diff --git a/.github/workflows/docker-env-build.yml b/.github/workflows/docker-env-build.yml
index ce582048..3dd76f05 100644
--- a/.github/workflows/docker-env-build.yml
+++ b/.github/workflows/docker-env-build.yml
@@ -1,9 +1,20 @@
 name: Build Docker environment container
 
 on:
+  workflow_dispatch:
   push:
     tags:
-      - "*"
+      - "android*"
+      - "base*"
+      - "linux*"
+      - "emsdk*"
+      - "wine*"
+      - "winsdk*"
+      - "nssdk*"
+      - "ps4*"
+      - "ps5*"
+
+
 
 env:
   GOOGLE_ARTIFACT_REGISTRY: europe-north1-docker.pkg.dev
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
deleted file mode 100644
index dc33555c..00000000
--- a/.github/workflows/dockerimage.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Docker Image CI
-
-on: [push, pull_request]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Install Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11.0.15'
-        distribution: 'temurin'
-
-    - name: Free disk space
-      run: |
-        df -h
-        sudo swapoff -a
-        sudo rm -f /swapfile
-        sudo apt clean
-        docker rmi $(docker image ls -aq)
-        df -h
-
-    - name: Build the extender-client.jar
-      run: (cd client && ../gradlew build)
-
-    - name: Test the extender-client.jar
-      run: (cd client && ../gradlew test)
-
-    - name: Build the Docker image
-      run: ./server/scripts/build.sh -xtest
-      env:
-            DM_PACKAGES_URL:  ${{ secrets.S3_URL }}
-
-    - name: Test the Docker image
-      run: ./gradlew test -i
-      env:
-            DM_PACKAGES_URL:  ${{ secrets.S3_URL }}
-
-    - name: Notify if tests failed
-      uses: homoluctus/slatify@master
-      if: failure()
-      with:
-        type: ${{ job.status }}
-        job_name: 'Extender tests'
-        channel: '#defold-alarms-build'
-        url: ${{ secrets.SLACK_WEBHOOK }}