diff --git a/.github/workflows/docker_push.yml b/.github/workflows/docker_push.yml
index fda2ff8..d486f5e 100644
--- a/.github/workflows/docker_push.yml
+++ b/.github/workflows/docker_push.yml
@@ -28,6 +28,10 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build new docker image
+        if: ${{ github.event_name == 'push' }}
+        run: docker build --no-cache . -t rmcolq/charon:latest --build-arg is_dev="True"
+      - name: Build new docker image
+        if: ${{ github.event_name == 'release' }}
         run: docker build --no-cache . -t rmcolq/charon:latest
 
       - name: Push Docker image to DockerHub (dev)
diff --git a/Dockerfile b/Dockerfile
index aa11928..1fde26f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM ubuntu:24.04
 
+ARG is_dev
+
 RUN apt update
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
     gcc-14 g++-14 \
@@ -11,12 +13,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
 RUN update-alternatives --install /usr/bin/g++ g++ /bin/g++-14 14 
 RUN update-alternatives --install /usr/bin/gcc gcc /bin/gcc-14 14
 
-RUN mkdir -p /charon
-COPY src /charon/src
-COPY include /charon/include
-COPY cmake /charon/cmake
-COPY lib /charon/lib
-COPY CMakeLists.txt version.h.in /charon
+WORKDIR /
+RUN if [[ -z "$is_dev" ]] ; then git clone -b dev https://github.com/rmcolq/charon.git; else git clone https://github.com/rmcolq/charon.git; fi
 WORKDIR /charon/build
 
 RUN cmake -DCMAKE_BUILD_TYPE=RELEASE .. > cmake.log