diff --git a/.env b/.env
index 1236457..faa656f 100644
--- a/.env
+++ b/.env
@@ -4,8 +4,8 @@ XAUTH=/tmp/.docker.xauth
 AVAILABLE_CORES=$(($(nproc) - 1))
 
 DOCKER_USER=tomnotch
-IMAGE_NAME=ros-1-noetic-base
-IMAGE_TAG=latest
+IMAGE_NAME=ros-base
+IMAGE_TAG=noetic
 
 CONTAINER_NAME=${IMAGE_NAME}
 CONTAINER_HOME_FOLDER=/root
diff --git a/docker/latest/Dockerfile b/docker/noetic/Dockerfile
similarity index 100%
rename from docker/latest/Dockerfile
rename to docker/noetic/Dockerfile