diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 4d628fd..1bace10 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -40,6 +40,9 @@ services:
       - POSTGRES_USER=gitea
       - POSTGRES_PASSWORD=gitea
       - POSTGRES_DB=gitea
+    # Workaround below for lack of docker uid mapping. Change the container's postgres user's uid/gid to match the host user's
+    entrypoint: bash
+    command: -c  'usermod -u ${CERC_HOST_UID:-1000} postgres;groupmod -g ${CERC_HOST_GID:-1000} postgres;exec /usr/local/bin/docker-entrypoint.sh postgres'
     networks:
       - gitea
     volumes:
diff --git a/gitea/run-this-first.sh b/gitea/run-this-first.sh
index 55adc4a..8eb3071 100755
--- a/gitea/run-this-first.sh
+++ b/gitea/run-this-first.sh
@@ -4,4 +4,3 @@ if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
 fi
 mkdir -p ./gitea
 mkdir -p ./gitea/ssh
-mkdir -p ./postgres