diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index b008efdc3..25c84975c 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM ampersandtarski/ampersand-devcontainer:latest
+FROM hanjoosten/ampersand-devcontainer:latest
 
 ENV DEBIAN_FRONTEND=dialog
 
diff --git a/.devcontainer/DockerfileUpstream2 b/.devcontainer/DockerfileUpstream2
new file mode 100644
index 000000000..470bfa332
--- /dev/null
+++ b/.devcontainer/DockerfileUpstream2
@@ -0,0 +1,23 @@
+FROM haskell:8.10
+
+ARG WDIR=/opt/Ampersand
+
+WORKDIR ${WDIR}
+
+RUN cabal update 
+
+# Add just the .cabal file to capture dependencies
+COPY ./ampersand.cabal ${WDIR}/ampersand.cabal
+
+# Docker will cache this command as a layer, freeing us up to
+# modify source code without re-installing dependencies
+# (unless the .cabal file changes!)
+RUN cabal build --only-dependencies -j4
+
+# Add and Install Application Code
+COPY . ${WDIR}
+RUN cabal install
+
+ENV DEBIAN_FRONTEND=dialog
+
+ENTRYPOINT ["/bin/bash"]
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 6cd875aea..735d44eeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ cabal.sandbox.config
 .cabal-sandbox
 .dist-buildwrapper
 /dist
+/dist-newstyle
 .idea
 .ampersand