diff --git a/.github/workflows/docker-app-room.yaml b/.github/workflows/docker-app-room.yaml
index 0178c7df3..1479ec76c 100644
--- a/.github/workflows/docker-app-room.yaml
+++ b/.github/workflows/docker-app-room.yaml
@@ -31,4 +31,4 @@ jobs:
 
       - name: push
         if: github.event_name == 'release'
-        run: docker push pionwebrtc/ion
+        run: docker push pionwebrtc/ion:"$TAG"-app-room
diff --git a/.github/workflows/docker-islb.yaml b/.github/workflows/docker-islb.yaml
index 0bf4d9619..60fee89ab 100644
--- a/.github/workflows/docker-islb.yaml
+++ b/.github/workflows/docker-islb.yaml
@@ -31,4 +31,4 @@ jobs:
 
       - name: push
         if: github.event_name == 'release'
-        run: docker push pionwebrtc/ion
+        run: docker push pionwebrtc/ion:"$TAG"-islb
diff --git a/.github/workflows/docker-sfu.yaml b/.github/workflows/docker-sfu.yaml
index fc4288396..73f94dbca 100644
--- a/.github/workflows/docker-sfu.yaml
+++ b/.github/workflows/docker-sfu.yaml
@@ -31,4 +31,4 @@ jobs:
 
       - name: push
         if: github.event_name == 'release'
-        run: docker push pionwebrtc/ion
+        run: docker push pionwebrtc/ion:"$TAG"-sfu
diff --git a/.github/workflows/docker-signal.yaml b/.github/workflows/docker-signal.yaml
new file mode 100644
index 000000000..1dad457a6
--- /dev/null
+++ b/.github/workflows/docker-signal.yaml
@@ -0,0 +1,34 @@
+name: signal docker
+on:
+  push:
+    branches:
+    - master
+  release:
+    types: [published]
+  pull_request:
+    branches:
+    - master
+jobs:
+  build:
+    name: build and push
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+    steps:
+      - uses: actions/checkout@v2
+    
+      - name: build
+        run: docker build --tag pionwebrtc/ion:latest-signal -f docker/signal.Dockerfile .
+
+      - name: login
+        if: github.event_name == 'release'
+        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+
+      - name: tag
+        if: github.event_name == 'release'
+        run: docker tag pionwebrtc/ion:latest-signal pionwebrtc/ion:"$TAG"-signal
+        env:
+          TAG: ${{ github.event.release.tag_name }}
+
+      - name: push
+        if: github.event_name == 'release'
+        run: docker push pionwebrtc/ion:"$TAG"-signal