diff --git a/conf/source/arm.src b/conf/source/arm.src
index f891578..fed305e 100644
--- a/conf/source/arm.src
+++ b/conf/source/arm.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-1.17.4-linux-arm-6
-SOURCE_SUM=771abb512809d8ddbc12381c58b42cc9b2e3569101d9a6e42fdf9195c584bfc1
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.18.0/gitea-1.18.0-linux-arm-6
+SOURCE_SUM=8a03c5d3c0f578117d46c5ce05d4c2d41d4f770cc4ba600e1b6b1f7d283a9dd5
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FILENAME=gitea
 SOURCE_EXTRACT=false
diff --git a/conf/source/arm64.src b/conf/source/arm64.src
index d898a69..17ea967 100644
--- a/conf/source/arm64.src
+++ b/conf/source/arm64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-1.17.4-linux-arm64
-SOURCE_SUM=f3d430855071ffe771fb2f28ddb47f25e99b5c2b6450d7c0225961a8d7baac71
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.18.0/gitea-1.18.0-linux-arm64
+SOURCE_SUM=0b5ea921a1fc7e69cf13bd578b2bdad10964ce49225aa5eb158435137f82f3f1
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FILENAME=gitea
 SOURCE_EXTRACT=false
diff --git a/conf/source/arm64_1.17.src b/conf/source/arm64_1.17.src
new file mode 100644
index 0000000..d898a69
--- /dev/null
+++ b/conf/source/arm64_1.17.src
@@ -0,0 +1,5 @@
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-1.17.4-linux-arm64
+SOURCE_SUM=f3d430855071ffe771fb2f28ddb47f25e99b5c2b6450d7c0225961a8d7baac71
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FILENAME=gitea
+SOURCE_EXTRACT=false
diff --git a/conf/source/arm_1.17.src b/conf/source/arm_1.17.src
new file mode 100644
index 0000000..f891578
--- /dev/null
+++ b/conf/source/arm_1.17.src
@@ -0,0 +1,5 @@
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-1.17.4-linux-arm-6
+SOURCE_SUM=771abb512809d8ddbc12381c58b42cc9b2e3569101d9a6e42fdf9195c584bfc1
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FILENAME=gitea
+SOURCE_EXTRACT=false
diff --git a/conf/source/armv7.src b/conf/source/armv7.src
index a2a0daa..16e9bc3 100644
--- a/conf/source/armv7.src
+++ b/conf/source/armv7.src
@@ -1,8 +1,8 @@
 # The armv7 build is brocken
 # See : https://github.com/go-gitea/gitea/issues/6700
 # Use temporary the armv6 binary
-SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-1.17.4-linux-arm-6
-SOURCE_SUM=771abb512809d8ddbc12381c58b42cc9b2e3569101d9a6e42fdf9195c584bfc1
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.18.0/gitea-1.18.0-linux-arm-6
+SOURCE_SUM=8a03c5d3c0f578117d46c5ce05d4c2d41d4f770cc4ba600e1b6b1f7d283a9dd5
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FILENAME=gitea
 SOURCE_EXTRACT=false
diff --git a/conf/source/armv7_1.17.src b/conf/source/armv7_1.17.src
new file mode 100644
index 0000000..a2a0daa
--- /dev/null
+++ b/conf/source/armv7_1.17.src
@@ -0,0 +1,8 @@
+# The armv7 build is brocken
+# See : https://github.com/go-gitea/gitea/issues/6700
+# Use temporary the armv6 binary
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-1.17.4-linux-arm-6
+SOURCE_SUM=771abb512809d8ddbc12381c58b42cc9b2e3569101d9a6e42fdf9195c584bfc1
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FILENAME=gitea
+SOURCE_EXTRACT=false
diff --git a/conf/source/i386.src b/conf/source/i386.src
index b768e97..1d64908 100644
--- a/conf/source/i386.src
+++ b/conf/source/i386.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-1.17.4-linux-386
-SOURCE_SUM=f18ebd43e87de83b681149e1802e0650fa29b6e25c4f6e1625899c6709706db3
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.18.0/gitea-1.18.0-linux-386
+SOURCE_SUM=e566b8d526d37b4946312da479242ec98ddd0a158e4593fd73cb223dd3cf8307
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FILENAME=gitea
 SOURCE_EXTRACT=false
diff --git a/conf/source/i386_1.17.src b/conf/source/i386_1.17.src
new file mode 100644
index 0000000..b768e97
--- /dev/null
+++ b/conf/source/i386_1.17.src
@@ -0,0 +1,5 @@
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-1.17.4-linux-386
+SOURCE_SUM=f18ebd43e87de83b681149e1802e0650fa29b6e25c4f6e1625899c6709706db3
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FILENAME=gitea
+SOURCE_EXTRACT=false
diff --git a/conf/source/x86-64.src b/conf/source/x86-64.src
index 7a35e99..4ca2fbe 100644
--- a/conf/source/x86-64.src
+++ b/conf/source/x86-64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-1.17.4-linux-amd64
-SOURCE_SUM=a720c1e87748e4fc5e37f4079ad0f8369d3c6d63e274856eb04201857c98ca2b
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.18.0/gitea-1.18.0-linux-amd64
+SOURCE_SUM=b45b715d519a97086208c6b42528d291dd1c4dfdf40321dc940030e1cf3de6e6
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FILENAME=gitea
 SOURCE_EXTRACT=false
diff --git a/conf/source/x86-64_1.17.src b/conf/source/x86-64_1.17.src
new file mode 100644
index 0000000..7a35e99
--- /dev/null
+++ b/conf/source/x86-64_1.17.src
@@ -0,0 +1,5 @@
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-1.17.4-linux-amd64
+SOURCE_SUM=a720c1e87748e4fc5e37f4079ad0f8369d3c6d63e274856eb04201857c98ca2b
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FILENAME=gitea
+SOURCE_EXTRACT=false
diff --git a/manifest.json b/manifest.json
index d687470..64e5513 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,7 @@
     },
     "url": "http://gitea.io",
     "license": "MIT",
-    "version": "1.17.4~ynh1",
+    "version": "1.18.0~ynh1",
     "maintainer": {
         "name": "Josué Tille",
         "email": "josue@tille.ch"
diff --git a/scripts/upgrade b/scripts/upgrade
index e6ffa01..e14c84f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -237,6 +237,10 @@ case $upstream_version in
     ynh_setup_source $final_path source/${architecture}_1.16
     restart_gitea
 ;&
+"1.16."* )
+    ynh_setup_source $final_path source/${architecture}_1.17
+    restart_gitea
+;&
 esac
 
 # Install gitea source