diff --git a/library/glassfish b/library/glassfish
index 359264a40a5c05..6ef6d3b34b0a27 100644
--- a/library/glassfish
+++ b/library/glassfish
@@ -1,9 +1,9 @@
 Maintainers: David Matejcek <david.matejcek@omnifish.ee> (@dmatej),
              Arjan Tijms <arjan.tijms@omnifish.ee> (@arjantijms),
              Ondro Mihalyi <ondro.mihalyi@omnifish.ee> (@ondromih)
-GitRepo: https://github.com/OmniFish-EE/docker-library-glassfish.git
+GitRepo: https://github.com/eclipse-ee4j/glassfish.docker.git
 GitFetch: refs/heads/main
-GitCommit: ac330bd8712c5df00cb7e76d2daaf539b01ff587
+GitCommit: 36c87fcf919c1adc76746eaddb9bae54edfb0aed
 
 Tags: 7.0.8, 7.0.8-jdk17, 7.0.8-jdk17-eclipse-temurin
 Architectures: amd64, arm64v8
@@ -33,6 +33,10 @@ Tags: 7.0.14, 7.0.14-jdk17, 7.0.14-jdk17-eclipse-temurin
 Architectures: amd64, arm64v8
 Directory: 7.0.14
 
-Tags: latest, 7.0.15, 7.0.15-jdk17, 7.0.15-jdk17-eclipse-temurin
+Tags: 7.0.15, 7.0.15-jdk17, 7.0.15-jdk17-eclipse-temurin
 Architectures: amd64, arm64v8
 Directory: 7.0.15
+
+Tags: latest, 7.0.16, 7.0.16-jdk17, 7.0.16-jdk17-eclipse-temurin
+Architectures: amd64, arm64v8
+Directory: 7.0.16