diff --git a/gitea.yaml b/gitea.yaml
index 90993fd..7c05193 100755
--- a/gitea.yaml
+++ b/gitea.yaml
@@ -48,8 +48,6 @@
         name: gitea_with_asciidoc
         source: build
         build:
-          cache_from:
-            - gitea/gitea:1.16.8
           path: "./gitea"
 
     - name: Run Gitea
@@ -57,25 +55,39 @@
         name: "{{ stack_prefix_name }}gitea"
         recreate: true
         restart_policy: unless-stopped
-        image: gitea_with_asciidoc
+        image: gitea/gitea:1.16.8
         published_ports:
           - "3000:3000"
         env:
           USER_UID: "1000"
           USER_GID: "1000"
-          GITEA__database__DB_TYPE: postgres
-          GITEA__database__HOST: "{{ stack_prefix_name }}gitea-db:5432"
-          GITEA__database__NAME: gitea
-          GITEA__database__USER: gitea
-          GITEA__database__PASSWD: "{{ secret_gitea_db_password }}"
+          "GITEA__APP_NAME": Sean's Code
+          "GITEA__database__DB_TYPE": postgres
+          "GITEA__database__HOST": "{{ stack_prefix_name }}gitea-db:5432"
+          "GITEA__database__NAME": gitea
+          "GITEA__database__USER": gitea
+          "GITEA__database__PASSWD": "{{ secret_gitea_db_password }}"
+          "GITEA__repository__DEFAULT_PUSH_CREATE_PRIVATE": "false"
+          "GITEA__repository__ENABLE_PUSH_CREATE_USER": "true"
+          "GITEA__repository__ROOT": /app/gitea/data/gitea-repositories
+          "GITEA__markup.asciidoc__ENABLED": "true"
+          "GITEA__markup.asciidoc__FILE_EXTENSIONS": .adoc,.asciidoc
+          "GITEA__markup.asciidoc__RENDER_COMMAND": "asciidoctor -s -a showtitle --out-file=- -"
+          "GITEA__markup.asciidoc__IS_INPUT_FILE": "false"
+          "GITEA__server__SSH_DOMAIN": code.sean.wtf
+          "GITEA__server__DOMAIN": code.sean.wtf
+          "GITEA__server__HTTP_PORT": "3000"
+          "GITEA__server__ROOT_URL": https://code.sean.wtf/
+          "GITEA__server__DISABLE_SSH": "true"
+          "GITEA__server__LFS_START_SERVER": "true"
+          "GITEA__server__LFS_CONTENT_PATH": /app/gitea/data/lfs
+          "GITEA__server__LFS_JWT_SECRET": "{{ secret_gitea_lfs_jwt_secret }}"
+          "GITEA__server__OFFLINE_MODE": "false"
         networks:
           - name: "{{ stack_internal_network }}"
           - name: "{{ stack_external_network }}"
         # May need to open ssh ports for some things. Maybe not.
         mounts:
-          - source: "/home/server/gitea/app.ini"
-            target: /data/gitea/conf/app.ini
-            type: bind
           - source: "{{ stack_prefix_name }}gitea_data"
             target: /data
           - source: /etc/timezone
diff --git a/gitea/Dockerfile b/gitea/Dockerfile
index 600fa27..df6ab99 100644
--- a/gitea/Dockerfile
+++ b/gitea/Dockerfile
@@ -1,5 +1,7 @@
-FROM gitea/gitea:1.16.8
+FROM gitea/gitea:1.17.0-rc1
 
 COPY app.ini /data/gitea/conf/app.ini
 
-RUN apk --no-cache add asciidoctor
\ No newline at end of file
+RUN apk --no-cache add asciidoctor
+
+RUN rm -rf /var/cache/apk/*
\ No newline at end of file
diff --git a/gitea/app.ini.j2 b/gitea/app.ini.j2
index 2edf4e7..e69de29 100644
--- a/gitea/app.ini.j2
+++ b/gitea/app.ini.j2
@@ -1,75 +0,0 @@
-APP_NAME = Sean's Code
-RUN_USER = git
-RUN_MODE = prod
-
-[database]
-NAME     = gitea
-DB_TYPE  = postgres
-USER     = gitea
-HOST     = server_gitea-db:5432
-PASSWD   = {{ secret_gitea_db_password }}
-SCHEMA   = 
-SSL_MODE = disable
-CHARSET  = utf8
-PATH     = /app/gitea/data/gitea.db
-LOG_SQL  = false
-
-[repository]
-DEFAULT_PUSH_CREATE_PRIVATE = false
-ENABLE_PUSH_CREATE_USER = true
-ROOT = /app/gitea/data/gitea-repositories
-
-[server]
-SSH_DOMAIN       = code.sean.wtf
-DOMAIN           = code.sean.wtf
-HTTP_PORT        = 3000
-ROOT_URL         = https://code.sean.wtf/
-DISABLE_SSH      = true
-LFS_START_SERVER = true
-LFS_CONTENT_PATH = /app/gitea/data/lfs
-LFS_JWT_SECRET   = {{ secret_gitea_lfs_jwt_secret }}
-OFFLINE_MODE     = false
-
-[mailer]
-ENABLED = false
-
-[markup.asciidoc]
-ENABLED = true
-FILE_EXTENSIONS = .adoc,.asciidoc
-; Input is not a standard input but a file
-RENDER_COMMAND = "asciidoctor -s -a showtitle --out-file=- -"
-IS_INPUT_FILE = false
-
-[service]
-REGISTER_EMAIL_CONFIRM            = false
-ENABLE_NOTIFY_MAIL                = false
-DISABLE_REGISTRATION              = true
-ALLOW_ONLY_EXTERNAL_REGISTRATION  = false
-ENABLE_CAPTCHA                    = false
-REQUIRE_SIGNIN_VIEW               = false
-DEFAULT_KEEP_EMAIL_PRIVATE        = true
-DEFAULT_ALLOW_CREATE_ORGANIZATION = true
-DEFAULT_ENABLE_TIMETRACKING       = true
-NO_REPLY_ADDRESS                  = noreply.code.sean.wtf
-
-[picture]
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = true
-
-[openid]
-ENABLE_OPENID_SIGNIN = false
-ENABLE_OPENID_SIGNUP = false
-
-[session]
-PROVIDER = file
-
-[log]
-MODE      = console
-LEVEL     = info
-ROOT_PATH = /app/gitea/log
-ROUTER    = console
-
-[security]
-INSTALL_LOCK       = true
-INTERNAL_TOKEN     = {{ secret_gitea_internal_token }}
-PASSWORD_HASH_ALGO = pbkdf2
\ No newline at end of file