diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b8f2483a..e84e0868 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-      - forge
+      - java8
       - openj9
       - openj9-11
       - openj9-nightly
@@ -15,7 +15,7 @@ on:
       - test/*
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+-forge"
+      - "[0-9]+.[0-9]+.[0-9]+-java8"
       - "[0-9]+.[0-9]+.[0-9]+-openj9"
       - "[0-9]+.[0-9]+.[0-9]+-openj9-11"
       - "[0-9]+.[0-9]+.[0-9]+-openj9-nightly"
diff --git a/Dockerfile b/Dockerfile
index 6c0d2a97..c21bbd0a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -77,9 +77,6 @@ ENV UID=1000 GID=1000 \
   ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
   AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
 
-# preset the server type
-ENV TYPE=FORGE
-
 COPY start* /
 COPY health.sh /
 ADD files/autopause /autopause
diff --git a/README.md b/README.md
index 116c310d..40546e29 100644
--- a/README.md
+++ b/README.md
@@ -162,8 +162,8 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 
 | Tag name       | Description                                 | Linux        |
 | -------------- | ------------------------------------------- | ------------ |
-| latest         | **Default**. Uses AdoptOpenJDK version 11   | Alpine Linux |
-| forge          | Uses Java 8 for mod compatibility           | Alpine Linux |
+| latest         | **Default**. Uses Java version 8            | Alpine Linux |
+| java8          | Uses Java 8 for Forge mod compatibility     | Alpine Linux |
 | adopt15        | Uses Java version 15 from AdoptOpenJDK      | Alpine Linux |
 | adopt14        | Uses Java version 14 from AdoptOpenJDK      | Alpine Linux |
 | adopt13        | Uses Java version 13 from AdoptOpenJDK      | Alpine Linux |
diff --git a/start-configuration b/start-configuration
index f68a841d..e4431321 100644
--- a/start-configuration
+++ b/start-configuration
@@ -96,7 +96,7 @@ case "${TYPE^^}" in
 
   FORGE)
     log "**********************************************************************"
-    log "WARNING: Use the image tag itzg/minecraft-server:forge"
+    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
     log "         since some mods require Java 8"
     log "**********************************************************************"
     exec ${SCRIPTS:-/}start-deployForge "$@"