diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3d34d1804c..2408057d2a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -373,13 +373,20 @@ jobs:
         environment:
           TOXENV: py37-eth2-components
 
-  docker-image-build-test:
+  docker-trinity-image-build-test:
     machine: true
     steps:
       - checkout
-      - run: docker build -t ethereum/trinity:test-build .
+      - run: docker build -t ethereum/trinity:test-build -f ./docker/Dockerfile .
       - run: docker run ethereum/trinity:test-build --help
 
+  docker-trinity-beacon-image-build-test:
+    machine: true
+    steps:
+      - checkout
+      - run: docker build -t ethereum/trinity-beacon:test-build -f ./docker/beacon.Dockerfile .
+      - run: docker run ethereum/trinity-beacon:test-build --help
+
 workflows:
   version: 2
   test:
@@ -434,4 +441,5 @@ workflows:
       - py37-lint
       - py37-lint-eth2
 
-      - docker-image-build-test
+      - docker-trinity-image-build-test
+      - docker-trinity-beacon-image-build-test
diff --git a/Dockerfile.eth2 b/Dockerfile.eth2
deleted file mode 100644
index d2c6a1ee51..0000000000
--- a/Dockerfile.eth2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM python:3.7
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# Install deps
-RUN apt-get update
-RUN apt-get -y install libsnappy-dev gcc g++ cmake
-
-ARG GITREF=interop
-
-RUN git clone https://github.com/ethereum/trinity.git .
-RUN git checkout $GITREF
-RUN pip install -e .[dev] --no-cache-dir
-RUN pip install -U trinity --no-cache-dir
-
-EXPOSE 30303 30303/udp
-# Trinity shutdowns aren't yet solid enough to avoid the fix-unclean-shutdown
-ENTRYPOINT trinity $EXTRA_OPTS fix-unclean-shutdown && trinity-beacon $EXTRA_OPTS
diff --git a/Makefile b/Makefile
index 67e6ce4bac..6d4c46545a 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ release: clean
 	git config commit.gpgSign "$(CURRENT_SIGN_SETTING)"
 
 create-docker-image: clean
-	docker build -t ethereum/trinity:latest -t ethereum/trinity:$(version) .
+	docker build -t ethereum/trinity:latest -t ethereum/trinity:$(version) -f ./docker/Dockerfile ./docker
 
 create-dappnode-image: clean
 	sed -i -e 's/ARG GITREF=\w*/ARG GITREF=$(trinity_version)/g' ./dappnode/build/Dockerfile
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from Dockerfile
rename to docker/Dockerfile
diff --git a/docker/beacon.Dockerfile b/docker/beacon.Dockerfile
new file mode 100644
index 0000000000..985d43b647
--- /dev/null
+++ b/docker/beacon.Dockerfile
@@ -0,0 +1,16 @@
+FROM python:3.7
+# Set up code directory
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+# Install deps
+RUN apt-get update
+RUN apt-get -y install libsnappy-dev gcc g++ cmake
+
+RUN git clone https://github.com/ethereum/trinity.git .
+RUN pip install -e .[eth2-dev] --no-cache-dir
+
+RUN echo "Type \`trinity-beacon\` to boot or \`trinity-beacon --help\` for an overview of commands"
+
+EXPOSE 30303 30303/udp
+ENTRYPOINT ["trinity-beacon"]