diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index e1f2d1c3e..48b43900f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,7 +17,6 @@ on:
 env:
   # TODO: Change variable to your image's name.
   IMAGE_NAME: iverilog
-  IMAGE_NAME_MAKE: iverilog-make
 
 jobs:
   # Push image to GitHub Packages.
@@ -32,20 +31,15 @@ jobs:
       - name: Build image
         run: docker build --build-arg GITHUB_WORKSPACE=$GITHUB_WORKSPACE . --file Dockerfile --tag $IMAGE_NAME
 
-      - name: Build image with entrypoint make
-        run: docker build --build-arg GITHUB_WORKSPACE=$GITHUB_WORKSPACE --target iverilog-make . --file Dockerfile --tag $IMAGE_NAME_MAKE
-
       - name: Log into registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
 
       - name: Push images
         run: |
           IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME
-          IMAGE_ID_MAKE=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME_MAKE
 
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          IMAGE_ID_MAKE=$(echo $IMAGE_ID_MAKE | tr '[A-Z]' '[a-z]')
 
           # Strip git ref prefix from version
           VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
@@ -61,6 +55,3 @@ jobs:
 
           docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
-
-          docker tag $IMAGE_NAME_MAKE $IMAGE_ID_MAKE:$VERSION
-          docker push $IMAGE_ID_MAKE:$VERSION
diff --git a/Dockerfile b/Dockerfile
index 9d4526060..4da0d4c56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,6 @@ RUN apk add --no-cache \
         libgcc \
         libhistory \
         libstdc++ \
-        make \
         readline \
         zlib
 
@@ -35,63 +34,51 @@ RUN sh autoconf.sh && \
     make && \
     make install
 
-FROM builder as test-builder
+FROM builder as builder-iverilog-regression-test
 
 RUN make check
 
-FROM base as test-release-candidate
-
-COPY --from=builder /usr/local /usr/local/
-
-FROM test-release-candidate as release-candidate
-
-RUN adduser --disabled-password ic
-USER ic
-WORKDIR /home/ic
-
-FROM release-candidate as release-candidate-entrypoint-make
-
-ENTRYPOINT [ "make" ]
-
-# This commented section or something similar may be used to test the release candidate
-# image before it is finally released.  A failure here would stop the process so that
-# a faulty image is not released.
-#
-# We create a layer that contains the tests as builder-iverilog-regression-test here:
-
-FROM builder as builder-iverilog-regression-test-base
-
 ARG REGRESSION_TEST_URL=https://github.com/steveicarus/ivtest.git
 RUN git clone ${REGRESSION_TEST_URL} ivtest
 
-FROM builder-iverilog-regression-test-base as builder-iverilog-regression-test
+# Running the tests here was useful for troubleshooting, but we also run them below
+# in a lighter weight image so it is not necessary to run them here anymore
+# WORKDIR ivtest
+# RUN perl vvp_reg.pl
+# RUN perl vpi_reg.pl
 
-WORKDIR ivtest
+FROM base as release-candidate
+
+COPY --from=builder /usr/local /usr/local/
+
+FROM release-candidate as iverilog-vpi
+
+RUN apk add --no-cache \
+     build-base
+
+FROM iverilog-vpi as test-iverilog-vpi
+
+RUN apk add --no-cache \
+     perl
+
+COPY --from=builder-iverilog-regression-test /ivtest /ivtest
+
+WORKDIR /ivtest
 RUN perl vvp_reg.pl
 RUN perl vpi_reg.pl
 
-FROM test-release-candidate as test-release-candidate-perl
-
-RUN apk add --no-cache \
-    musl \
-    perl
-
-RUN adduser --disabled-password ic
-USER ic
-WORKDIR /home/ic
-
-COPY --from=builder-iverilog-regression-test-base /ivtest /home/ic/
-
-RUN perl vvp_reg.pl
-# RUN perl vpi_reg.pl
-# RUN perl vhdl_reg.pl
-
-FROM release-candidate-entrypoint-make as iverilog-make
-
 FROM release-candidate as iverilog
-
+#
 # Below are some sample commands to build docker images.
 # 
+# The vpi_reg.pl script wont run in this 87.5 MB image which does not contain perl or c/c++
 # docker build  . -t iverilog
 #
-# docker build --target iverilog-make . -t iverilog-make
\ No newline at end of file
+# This is a larger 298 MB image with c/c++ compilers through build-base
+# docker build --target iverilog-vpi . -t iverilog-vpi
+#
+# This is a larger 343 MB image with c/c++ compilers throubh build-base and perl
+# docker build --target test-iverilog-vpi . -t iverilog-perl
+#
+# This is a larger 598 MB image with full featured compiler, git, and full build results 
+# docker build --target builder . -t iverilog-builder
\ No newline at end of file