diff --git a/forgejo_cloudflare/.env b/forgejo_cloudflare/.env
index 2e3871d..fd33e4e 100644
--- a/forgejo_cloudflare/.env
+++ b/forgejo_cloudflare/.env
@@ -12,6 +12,10 @@ ROOT_URL=https://${FORGEJO_HOSTNAME}
 # Cloudflare Tunnel Token
 TUNNEL_TOKEN=  ##REQUIRED##
 
+# GIST (we'll need this values later, once Forgejo is up and running)
+OPENGIST_GITEA_CLIENT_ID=
+OPENGIST_GITEA_SECRET=
+
 # Database
 FORGEJO_DB_PASSWORD= ##REQUIRED## 
 
diff --git a/forgejo_cloudflare/docker-compose.yml b/forgejo_cloudflare/docker-compose.yml
index d91fbdc..14ba3ea 100644
--- a/forgejo_cloudflare/docker-compose.yml
+++ b/forgejo_cloudflare/docker-compose.yml
@@ -57,6 +57,19 @@ services:
     depends_on:
       - db
 
+  opengist:
+    image: ghcr.io/thomiceli/opengist:1.8
+    restart: unless-stopped
+    environment:
+     - OG_SSH_GIT_ENABLED=false
+     - OG_HTTP_PORT=80
+     - OG_GITEA_NAME=Forgejo
+     - OG_GITEA_URL=${ROOT_URL}
+     - OG_GITEA_CLIENT_KEY=${OPENGIST_GITEA_CLIENT_ID}
+     - OG_GITEA_SECRET=${OPENGIST_GITEA_SECRET}
+    volumes:
+      - "./data/opengist:/opengist"
+
   db:
     image: postgres:13
     restart: always