diff --git a/.github/workflows/container-images.yml b/.github/workflows/container-images.yml
new file mode 100644
index 000000000..a53fd53f2
--- /dev/null
+++ b/.github/workflows/container-images.yml
@@ -0,0 +1,39 @@
+name: Create and Push Container Image (heighliner)
+
+on:
+  push:
+    tags:
+    - '**'
+    branches:
+    - '**'
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build and push Docker image
+      uses: strangelove-ventures/heighliner-build-action@v1.0.1
+      with:
+        chain: pocket-network
+        dockerfile: cosmos
+        pre-build: |
+          make ignite_install
+          make proto_regen
+        build-target: |
+          make install
+        binaries: |
+          - /go/bin/poktrolld
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index cc701b987..469367137 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -50,7 +50,7 @@ jobs:
         images: |
           ghcr.io/pokt-network/poktrolld
         tags: |
-          type=ref,event=branch
+          type=ref,event=branch,suffix=-dev
           type=ref,event=pr
           type=sha
           type=sha,format=long