diff --git a/Dockerfile b/contrib/docker/frontend-with-nginx/Dockerfile
similarity index 90%
rename from Dockerfile
rename to contrib/docker/frontend-with-nginx/Dockerfile
index 174548a90c..a444c9de83 100644
--- a/Dockerfile
+++ b/contrib/docker/frontend-with-nginx/Dockerfile
@@ -8,8 +8,6 @@ FROM nginx:mainline
 # This dockerfile requires the app to be built on the host first, as it
 # simply copies in the build output into the image.
 
-# The safest way to build this image is to use `yarn docker-build:app`
-
 RUN apt-get update && apt-get -y install jq && rm -rf /var/lib/apt/lists/*
 
 COPY packages/app/dist /usr/share/nginx/html
diff --git a/docker/default.conf.template b/contrib/docker/frontend-with-nginx/docker/default.conf.template
similarity index 100%
rename from docker/default.conf.template
rename to contrib/docker/frontend-with-nginx/docker/default.conf.template
diff --git a/docker/run.sh b/contrib/docker/frontend-with-nginx/docker/run.sh
similarity index 100%
rename from docker/run.sh
rename to contrib/docker/frontend-with-nginx/docker/run.sh
diff --git a/docs/overview/architecture-overview.md b/docs/overview/architecture-overview.md
index d8069c8665..f2f2bc72c8 100644
--- a/docs/overview/architecture-overview.md
+++ b/docs/overview/architecture-overview.md
@@ -185,17 +185,6 @@ separate Docker images.
 
 ![Boxes around the architecture to indicate how it is containerised](../assets/architecture-overview/containerised.png)
 
-The frontend container can be built with a provided command.
-
-```bash
-yarn install
-yarn tsc
-yarn run docker-build:app
-```
-
-Running this will simply generate a Docker container containing the contents of
-the UIs `dist` directory.
-
 The backend container can be built by running the following command:
 
 ```bash
diff --git a/docs/support/project-structure.md b/docs/support/project-structure.md
index bb2c02ec76..5c8a8cd3bb 100644
--- a/docs/support/project-structure.md
+++ b/docs/support/project-structure.md
@@ -32,10 +32,6 @@ the code.
   better control over our `yarn.lock` file and hopefully avoid problems due to
   yarn versioning differences.
 
-- [`docker/`](https://github.com/backstage/backstage/tree/master/docker) - Files
-  related to our root Dockerfile. We are planning to refactor this, so expect
-  this folder to be moved in the future.
-
 - [`contrib/`](https://github.com/backstage/backstage/tree/master/contrib) -
   Collection of examples or resources provided by the community. We really
   appreciate contributions in here and encourage them being kept up to date.
diff --git a/package.json b/package.json
index e2e3f1b075..aaa68e67de 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
     "lint:all": "lerna run lint --",
     "lint:type-deps": "node scripts/check-type-dependencies.js",
     "docgen": "lerna run docgen",
-    "docker-build:app": "yarn workspace example-app build && docker build . -t spotify/backstage",
     "docker-build": "yarn tsc && yarn workspace example-backend build-image",
     "create-plugin": "backstage-cli create-plugin --scope backstage --no-private",
     "remove-plugin": "backstage-cli remove-plugin",