diff --git a/dappnode_package.json b/dappnode_package.json
index c7b7a19..9441017 100644
--- a/dappnode_package.json
+++ b/dappnode_package.json
@@ -26,7 +26,7 @@
     {
       "arg": "UPSTREAM_VERSION",
       "repo": "erigontech/erigon",
-      "version": "v3.6.0"
+      "version": "v3.6.1"
     },
     {
       "arg": "STAKER_SCRIPTS_VERSION",
diff --git a/docker-compose.yml b/docker-compose.yml
index 60b1682..6ad88fd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     build:
       context: erigon
       args:
-        UPSTREAM_VERSION: v3.6.0
+        UPSTREAM_VERSION: v3.6.1
         STAKER_SCRIPTS_VERSION: v0.1.2
         DATA_DIR: /home/erigon/.local/share
     environment:
diff --git a/package_variants/gnosis/dappnode_package.json b/package_variants/gnosis/dappnode_package.json
index 43ed839..0434d8d 100644
--- a/package_variants/gnosis/dappnode_package.json
+++ b/package_variants/gnosis/dappnode_package.json
@@ -1,32 +1,34 @@
 {
-  "name": "gnosis-erigon.dnp.dappnode.eth",
-  "version": "1.0.6",
-  "requirements": {
-    "minimumDappnodeVersion": "0.3.12",
-    "notInstalledPackages": ["nimbus-gnosis.dnp.dappnode.eth"]
-  },
-  "links": {
-    "api": "http://gnosis-erigon.dappnode:8545",
-    "apiEngine": "http://gnosis-erigon.dappnode:8551",
-    "homepage": "https://github.com/ledgerwatch/erigon"
-  },
   "exposable": [
     {
-      "name": "Erigon JSON RPC",
       "description": "JSON RPC endpoint for Erigon in Gnosis Chain",
-      "serviceName": "erigon",
-      "port": 8545
+      "name": "Erigon JSON RPC",
+      "port": 8545,
+      "serviceName": "erigon"
     },
     {
-      "name": "Erigon JSON RPC (WS)",
       "description": "JSON RPC WebSocket endpoint for Erigon in Gnosis Chain",
-      "serviceName": "erigon",
-      "port": 8545
+      "name": "Erigon JSON RPC (WS)",
+      "port": 8545,
+      "serviceName": "erigon"
     }
   ],
+  "links": {
+    "api": "http://gnosis-erigon.dappnode:8545",
+    "apiEngine": "http://gnosis-erigon.dappnode:8551",
+    "homepage": "https://github.com/ledgerwatch/erigon"
+  },
+  "name": "gnosis-erigon.dnp.dappnode.eth",
   "optionalDependencies": {
     "lighthouse-gnosis.dnp.dappnode.eth": ">=0.1.15",
-    "teku-gnosis.dnp.dappnode.eth": ">=0.1.15",
-    "lodestar-gnosis.dnp.dappnode.eth": ">=0.1.32"
-  }
+    "lodestar-gnosis.dnp.dappnode.eth": ">=0.1.32",
+    "teku-gnosis.dnp.dappnode.eth": ">=0.1.15"
+  },
+  "requirements": {
+    "minimumDappnodeVersion": "0.3.12",
+    "notInstalledPackages": [
+      "nimbus-gnosis.dnp.dappnode.eth"
+    ]
+  },
+  "version": "1.0.8"
 }
diff --git a/package_variants/hoodi/dappnode_package.json b/package_variants/hoodi/dappnode_package.json
index c9ffe93..6f9dc69 100644
--- a/package_variants/hoodi/dappnode_package.json
+++ b/package_variants/hoodi/dappnode_package.json
@@ -1,23 +1,23 @@
 {
-  "name": "hoodi-erigon.dnp.dappnode.eth",
-  "version": "0.1.2",
-  "links": {
-    "api": "http://hoodi-erigon.dappnode:8545",
-    "apiEngine": "http://hoodi-erigon.dappnode:8551",
-    "homepage": "https://github.com/ledgerwatch/erigon"
-  },
   "exposable": [
     {
-      "name": "Hoodi Erigon JSON RPC",
       "description": "JSON RPC endpoint for Erigon hoodi",
-      "serviceName": "erigon",
-      "port": 8545
+      "name": "Hoodi Erigon JSON RPC",
+      "port": 8545,
+      "serviceName": "erigon"
     },
     {
-      "name": "Hoodi Erigon JSON RPC (WS)",
       "description": "JSON RPC WebSocket endpoint for Erigon hoodi",
-      "serviceName": "erigon",
-      "port": 8545
+      "name": "Hoodi Erigon JSON RPC (WS)",
+      "port": 8545,
+      "serviceName": "erigon"
     }
-  ]
+  ],
+  "links": {
+    "api": "http://hoodi-erigon.dappnode:8545",
+    "apiEngine": "http://hoodi-erigon.dappnode:8551",
+    "homepage": "https://github.com/ledgerwatch/erigon"
+  },
+  "name": "hoodi-erigon.dnp.dappnode.eth",
+  "version": "0.1.4"
 }