diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 35a44d9..b7aeeb5 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:latest
 
 LABEL name="Tracd Standalone Server"
 LABEL project="tracd"
@@ -11,7 +11,8 @@ ENV USER_GID=2000
 RUN dnf -y install trac httpd-tools ;\
 	dnf -y clean all
 
-RUN useradd --shell /sbin/nologin --create-home --home-dir /home/trac --uid $USER_UID trac
+RUN groupadd --gid $USER_GID trac ;\
+	useradd --shell /sbin/nologin --create-home --home-dir /home/trac --uid $USER_UID --gid $USER_GID trac
 
 WORKDIR /home/trac
 USER trac
diff --git a/README.md b/README.md
index d7b29c8..35b1968 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Here are some example snippets to help you get started creating a container.
 version: "3"
 services:
   server:
-    image: bitdeals/trac:latest
+    image: bitdeals/trac:1.5.3-fedora
     environment:
       - USER_UID=2000
       - USER_GID=2000
diff --git a/docker-compose.yml b/docker-compose.yml
index f8f89bb..14e4aa2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ networks:
 
 services:
   server:
-    image: bitdeals/trac:1.5.3-fedora36
+    image: bitdeals/trac:1.5.3-fedora
     build: ./Docker
     container_name: trac
     environment: