diff --git a/.github/workflows/docker-embedded-publish.yml b/.github/workflows/docker-embedded-publish.yml
index 5b987b0..caee702 100644
--- a/.github/workflows/docker-embedded-publish.yml
+++ b/.github/workflows/docker-embedded-publish.yml
@@ -6,7 +6,7 @@ on:
       gfVersion:
         description: 'The value of the glassfish.version property, used also to build the image.'
         required: true
-        default: '7.1.0'
+        default: '8.0.0'
       basicImage:
         description: 'The basic docker image'
         required: true
diff --git a/.github/workflows/docker-server-publish.yml b/.github/workflows/docker-server-publish.yml
index 4b1ad0b..90b4569 100644
--- a/.github/workflows/docker-server-publish.yml
+++ b/.github/workflows/docker-server-publish.yml
@@ -6,7 +6,7 @@ on:
       gfVersion:
         description: 'The value of the glassfish.version property, used also to build the image.'
         required: true
-        default: '7.1.0'
+        default: '8.0.0'
       basicImage:
         description: 'The basic docker image'
         required: true
diff --git a/pom.xml b/pom.xml
index a277ab0..9950187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <name>Eclipse Glassfish Docker Image Distribution</name>
 
     <properties>
-        <glassfish.version>7.1.0</glassfish.version>
+        <glassfish.version>8.0.0</glassfish.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
diff --git a/src/main/resources/images/server/Dockerfile b/src/main/resources/images/server/Dockerfile
index 0841213..9eeecb8 100755
--- a/src/main/resources/images/server/Dockerfile
+++ b/src/main/resources/images/server/Dockerfile
@@ -19,7 +19,7 @@ ARG AS_ADMIN_PASSWORD=admin \
     PATH_GF_PASSWORD_FILE_FOR_CHANGE=/password-change.txt \
     UID=1000 \
     GID=1000
-ENV PATH_GF_HOME=/opt/glassfish7 \
+ENV PATH_GF_HOME=/opt/glassfish \
     AS_ADMIN_USER=admin \
     AS_ADMIN_PASSWORDFILE=/password.txt
 ENV AS_USER=${AS_ADMIN_USER} \
@@ -47,8 +47,10 @@ RUN true \
     && rm glassfish.zip.asc \
     && echo "$GLASSFISH_DOWNLOAD_SHA512 glassfish.zip" | sha512sum --strict --check \
     && mkdir -p "${PATH_GF_HOME}" \
-    && unzip -q glassfish.zip -d "${PATH_GF_HOME}/.." \
-    && rm glassfish.zip \
+    && TMPDIR=$(mktemp -d /opt/gfXXXX) \
+    && unzip -q glassfish.zip -d "$TMPDIR" \
+    && cp -r "$TMPDIR"/*/* "${PATH_GF_HOME}/" \
+    && rm -rf "$TMPDIR" glassfish.zip \
     && userdel -r ubuntu \
     && groupadd -g ${GID} glassfish \
     && useradd -r -l -u ${UID} -g ${GID} -d "${PATH_GF_HOME}" -s /bin/bash glassfish \