diff --git a/.env.template b/.env.template
index 58c7b9991a18db16b60d322d4225d5779dd536e0..50bccd79b8997e1e255f4fe320f7282ec23ca89e 100644
--- a/.env.template
+++ b/.env.template
@@ -31,9 +31,7 @@ REDIS_PORT=6379
 FEDORA_URL_SCHEME=http
 FEDORA_HOST=fcrepo
 FEDORA_PORT=8080
-# FCREPO_ENDPOINT=hyrax_production # Optional - default is production
-# FCREPO_PATH is Optional - default is /fcrepo/rest
-FCREPO_PATH=/fcrepo/rest
+FCREPO_PATH=/rest
 FCREPO_VERSION=4.7.5
 FCREPO_DEVELOPMENT_PORT=8080
 FEDORA_TEST_PORT=8080
diff --git a/.env.template.development b/.env.template.development
index 15e6994458143b7e0fba04666e19c3d7457aaa3d..1e64545176fdd662b08f1b476ed8c54840a7231e 100644
--- a/.env.template.development
+++ b/.env.template.development
@@ -26,9 +26,7 @@ REDIS_PORT=6379
 FEDORA_URL_SCHEME=http
 FEDORA_HOST=fcrepo
 FEDORA_PORT=8080
-# FCREPO_ENDPOINT=hyrax_production # Optional - default is production
-# FCREPO_PATH is Optional - default is /fcrepo/rest
-FCREPO_PATH=/fcrepo/rest
+FCREPO_PATH=/rest
 FCREPO_VERSION=4.7.5
 FCREPO_DEVELOPMENT_PORT=8080
 FEDORA_TEST_PORT=8080
diff --git a/docker-compose.yml b/docker-compose.yml
index afe81ea4fcfa41be9b257d43991a7a2e4710975d..72027e84ce43b9730b765e75d984ca88e047d36b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 
 services:
   fcrepo:
-    image: ualbertalib/docker-fcrepo4:4.7
+    image: ghcr.io/samvera/fcrepo4:4.7.5
     restart: unless-stopped
     expose:
       - 8080
diff --git a/hyrax/config/fedora.yml b/hyrax/config/fedora.yml
index 41b2f27142384573284951a4151d20156d2c67ee..53d886bca0508e913969108d7b9462ef73314739 100644
--- a/hyrax/config/fedora.yml
+++ b/hyrax/config/fedora.yml
@@ -11,5 +11,5 @@ test:
 production:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: <%= ENV['FEDORA_URL_SCHEME'] || 'http' %>://<%= ENV['FEDORA_HOST'] || 'fcrepo' %>:<%= ENV['FEDORA_PORT'] || '8080' %><%= ENV['FCREPO_PATH'] || '/fcrepo/rest' %>
-  base_path: /hyrax_production
\ No newline at end of file
+  url: <%= ENV['FEDORA_URL_SCHEME'] || 'http' %>://<%= ENV['FEDORA_HOST'] || 'fcrepo' %>:<%= ENV['FEDORA_PORT'] || '8080' %><%= ENV['FCREPO_PATH'] || '/rest' %>
+  base_path: /hyrax_production
diff --git a/hyrax/docker-entrypoint.sh b/hyrax/docker-entrypoint.sh
index cfd73e20999ba9345cd97dfe8ba164ab93d6abc9..1383c53aecc7c95fcadc64f3912cbdf7099e634c 100644
--- a/hyrax/docker-entrypoint.sh
+++ b/hyrax/docker-entrypoint.sh
@@ -36,7 +36,7 @@ do
 
     # check Fedora is running
     if [ ${fedora_running} -eq 0 ] ; then
-      fedora_curl=$(curl --silent --connect-timeout 45 "http://${FEDORA_HOST:-fcrepo}:${FEDORA_PORT:-8080}/fcrepo/" | grep "Fedora Commons Repository")
+      fedora_curl=$(curl --silent --connect-timeout 45 "http://${FEDORA_HOST:-fcrepo}:${FEDORA_PORT:-8080}/" | grep "Fedora Commons Repository")
       if [ -n "${fedora_curl}" ] ; then
           echo "Fedora is running"
           fedora_running=1