diff --git a/deprecated/golang/deprecated.txt b/deprecated/golang/deprecated.txt
deleted file mode 100644
index 60285084..00000000
--- a/deprecated/golang/deprecated.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-##############################################################
-# DEPRECATED: this image is no longer updated.               #
-# Please migrate to codercom/enterprise-base:ubuntu          #
-# or build a custom image FROM it.                           #
-# For more information see:                                  #
-# https://github.com/coder/enterprise-images/issues/238      #
-##############################################################
diff --git a/deprecated/java/deprecated.txt b/deprecated/java/deprecated.txt
deleted file mode 100644
index 60285084..00000000
--- a/deprecated/java/deprecated.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-##############################################################
-# DEPRECATED: this image is no longer updated.               #
-# Please migrate to codercom/enterprise-base:ubuntu          #
-# or build a custom image FROM it.                           #
-# For more information see:                                  #
-# https://github.com/coder/enterprise-images/issues/238      #
-##############################################################
diff --git a/deprecated/node/deprecated.txt b/deprecated/node/deprecated.txt
deleted file mode 100644
index 60285084..00000000
--- a/deprecated/node/deprecated.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-##############################################################
-# DEPRECATED: this image is no longer updated.               #
-# Please migrate to codercom/enterprise-base:ubuntu          #
-# or build a custom image FROM it.                           #
-# For more information see:                                  #
-# https://github.com/coder/enterprise-images/issues/238      #
-##############################################################
diff --git a/deprecated/golang/Dockerfile.ubuntu b/images/golang/Dockerfile.ubuntu
similarity index 78%
rename from deprecated/golang/Dockerfile.ubuntu
rename to images/golang/Dockerfile.ubuntu
index 161d1a29..a1ca6337 100644
--- a/deprecated/golang/Dockerfile.ubuntu
+++ b/images/golang/Dockerfile.ubuntu
@@ -14,8 +14,5 @@ ENV GOPATH /home/coder/go
 ENV GOBIN $GOPATH/bin
 ENV PATH $PATH:$GOBIN
 
-COPY deprecated.txt /etc/motd
-RUN echo '[ ! -z "$TERM" ] && cat /etc/motd' >> /etc/bash.bashrc
-
 # Set back to coder user
 USER coder
diff --git a/deprecated/golang/README.md b/images/golang/README.md
similarity index 83%
rename from deprecated/golang/README.md
rename to images/golang/README.md
index 70e29150..527dbc76 100644
--- a/deprecated/golang/README.md
+++ b/images/golang/README.md
@@ -1,4 +1,4 @@
-# Enterprise Golang
+# Golang
 
 [![DockerPulls](https://img.shields.io/docker/pulls/codercom/enterprise-golang)](https://hub.docker.com/r/codercom/enterprise-golang)
 
@@ -7,7 +7,7 @@
 Wraps [enterprise-base](../base/README.md) with the basics for Go development.
 
 > **Note:** This image does not contain GoLand. For an example of how to install
-> GoLand, see [enterprise-goland](../goland/README.md)
+> GoLand, see [enterprise-goland](../../deprecated/goland/README.md)
 
 ## How To Use
 
diff --git a/deprecated/java/Dockerfile.ubuntu b/images/java/Dockerfile.ubuntu
similarity index 95%
rename from deprecated/java/Dockerfile.ubuntu
rename to images/java/Dockerfile.ubuntu
index 5d5fbeba..4f76efb2 100644
--- a/deprecated/java/Dockerfile.ubuntu
+++ b/images/java/Dockerfile.ubuntu
@@ -52,8 +52,5 @@ RUN mkdir -p /usr/share/gradle /usr/share/gradle/ref \
 
 ENV PATH $PATH:$GRADLE_HOME/bin
 
-COPY deprecated.txt /etc/motd
-RUN echo '[ ! -z "$TERM" ] && cat /etc/motd' >> /etc/bash.bashrc
-
 # Set back to coder user
 USER coder
diff --git a/deprecated/java/README.md b/images/java/README.md
similarity index 82%
rename from deprecated/java/README.md
rename to images/java/README.md
index e4f55c4f..27d246da 100644
--- a/deprecated/java/README.md
+++ b/images/java/README.md
@@ -1,4 +1,4 @@
-# Enterprise Java
+# Java
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/codercom/enterprise-java?label=codercom%2Fenterprise-java)](https://hub.docker.com/r/codercom/enterprise-java)
 
@@ -7,7 +7,7 @@
 Wraps [enterprise-base](../base/README.md) with the basics for Java development.
 
 > **Note:** This image does not contain IntelliJ. For an example of how to
-> install IntelliJ, see [enterprise-intellij](../intellij/README.md)
+> install IntelliJ, see [enterprise-intellij](../../deprecated/intellij/README.md)
 
 ## How To Use
 
diff --git a/deprecated/node/Dockerfile.ubuntu b/images/node/Dockerfile.ubuntu
similarity index 85%
rename from deprecated/node/Dockerfile.ubuntu
rename to images/node/Dockerfile.ubuntu
index 27dda130..b466aca5 100644
--- a/deprecated/node/Dockerfile.ubuntu
+++ b/images/node/Dockerfile.ubuntu
@@ -13,8 +13,5 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 RUN DEBIAN_FRONTEND="noninteractive" apt-get update && apt-get install -y yarn
 
-COPY deprecated.txt /etc/motd
-RUN echo '[ ! -z "$TERM" ] && cat /etc/motd' >> /etc/bash.bashrc
-
 # Set back to coder user
 USER coder
diff --git a/deprecated/node/README.md b/images/node/README.md
similarity index 94%
rename from deprecated/node/README.md
rename to images/node/README.md
index 496ea202..b7da053a 100644
--- a/deprecated/node/README.md
+++ b/images/node/README.md
@@ -1,4 +1,4 @@
-# Enterprise Node
+# Node
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/codercom/enterprise-node?label=codercom%2Fenterprise-node)](https://hub.docker.com/r/codercom/enterprise-node)