diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index ede46697..2a6653c8 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -16,6 +16,25 @@ on:
       - ".github/workflows/docker.yaml"
     types: [opened, reopened, synchronize, ready_for_review]
   workflow_dispatch:
+    inputs:
+      type:
+        description: 'Type of docker image to build'
+        type: choice
+        required: true
+        options:
+          - "explorers"
+          - "faucet"
+          - "relayers"
+          - "starship"
+          - "chains"
+      process:
+        description: 'Process to run'
+        type: string
+        default: "all"
+      version:
+        description: 'Version of docker image to build'
+        type: string
+        default: "all"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-docker
@@ -66,7 +85,7 @@ jobs:
           ./starship/scripts/build-docker.sh --type ${{ matrix.build-type }} --process all --version all --push
 
       - name: Force Build and Push for workflow dispatch
-        if: github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'workflow_dispatch' && github.event.inputs.type == matrix.build-type
         run: |
           ./starship/scripts/build-docker.sh --type ${{ matrix.build-type }} --process all --version all --push --force
 
@@ -112,6 +131,10 @@ jobs:
           cd docker/chains && ./build-docker-chains.sh --chain all --tag all --push
 
       - name: Force Build and Push for workflow dispatch
-        if: github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'chains'
         run: |
-          cd docker/chains && ./build-docker-chains.sh --chain all --tag all --push --force
+          cd docker/chains && ./build-docker-chains.sh --chain $PROCESS --tag $VERSION --push --force
+        env:
+          PROCESS: ${{ github.event.inputs.process }}
+          VERSION: ${{ github.event.inputs.version }}
+
diff --git a/starship/docker/chains/Dockerfile.neutron b/starship/docker/chains/Dockerfile.neutron
new file mode 100644
index 00000000..75d67380
--- /dev/null
+++ b/starship/docker/chains/Dockerfile.neutron
@@ -0,0 +1,17 @@
+ARG BASE_IMAGE
+
+FROM ${BASE_IMAGE} as build-env
+
+ARG VERSION
+
+ENV CODE_REF="https://github.com/neutron-org/neutron/archive/refs/tags/${VERSION}.tar.gz"
+
+RUN apt-get update && apt-get install -y jq xxd curl make bash jq sed
+
+WORKDIR /opt/neutron
+
+ADD $CODE_REF neutron.tar.gz
+RUN tar --strip-components=1 -xvf neutron.tar.gz
+RUN rm -rf neutron.tar.gz
+
+RUN cd /opt/neutron && make install-test-binary
diff --git a/starship/docker/chains/versions.yaml b/starship/docker/chains/versions.yaml
index cf37e87c..f0ff1ffc 100644
--- a/starship/docker/chains/versions.yaml
+++ b/starship/docker/chains/versions.yaml
@@ -301,7 +301,8 @@ chains:
     tags:
       - v1.4.4
   - name: neutron
-    base: ghcr.io/strangelove-ventures/heighliner/neutron
+    base: golang:1.21-bullseye
+    file: Dockerfile.neutron
     tags:
       - v3.0.6
       - v3.0.5