diff --git a/installer/installer.sh b/installer/installer.sh
index c6f848ff9..2275b2b35 100644
--- a/installer/installer.sh
+++ b/installer/installer.sh
@@ -83,7 +83,7 @@ install_aliases() {
 
 install_directory() {
     ARCHIVE_REPOSITORY_URL="github.com/OriginTrail/ot-node/archive"
-    BRANCH="v8/release/testnet"
+    BRANCH="v6/release/testnet"
     BRANCH_DIR="/root/ot-node-8-release-testnet"
 
     perform_step wget https://$ARCHIVE_REPOSITORY_URL/$BRANCH.zip "Downloading node files"
diff --git a/package-lock.json b/package-lock.json
index 7ecb4f8b7..e5a8d8f2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "origintrail_node",
-    "version": "8.0.0+hotfix.4",
+    "version": "8.0.0+hotfix.5",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "origintrail_node",
-            "version": "8.0.0+hotfix.4",
+            "version": "8.0.0+hotfix.5",
             "license": "ISC",
             "dependencies": {
                 "@comunica/query-sparql": "^2.4.3",
diff --git a/package.json b/package.json
index 355baaef1..3dea40529 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "origintrail_node",
-    "version": "8.0.0+hotfix.4",
+    "version": "8.0.0+hotfix.5",
     "description": "OTNode V8",
     "main": "index.js",
     "type": "module",
diff --git a/src/constants/constants.js b/src/constants/constants.js
index 67491b9fd..6813798da 100644
--- a/src/constants/constants.js
+++ b/src/constants/constants.js
@@ -831,8 +831,8 @@ export const OPERATION_ID_COMMAND_CLEANUP_TIME_MILLS = 24 * 60 * 60 * 1000;
  * finalized commands command cleanup interval time 24h
  */
 
-export const PUBLISH_STORAGE_MEMORY_CLEANUP_COMMAND_CLEANUP_TIME_MILLS = 4 * 60 * 60 * 1000;
-export const PUBLISH_STORAGE_FILE_CLEANUP_COMMAND_CLEANUP_TIME_MILLS = 24 * 60 * 60 * 1000;
+export const PUBLISH_STORAGE_MEMORY_CLEANUP_COMMAND_CLEANUP_TIME_MILLS = 2 * 60 * 60 * 1000;
+export const PUBLISH_STORAGE_FILE_CLEANUP_COMMAND_CLEANUP_TIME_MILLS = 2 * 60 * 60 * 1000;
 
 export const FINALIZED_COMMAND_CLEANUP_TIME_MILLS = 24 * 60 * 60 * 1000;
 
@@ -878,7 +878,7 @@ export const COMMAND_STATUS = {
     REPEATING: 'REPEATING',
 };
 
-export const PENDING_STORAGE_FILES_FOR_REMOVAL_MAX_NUMBER = 100;
+export const PENDING_STORAGE_FILES_FOR_REMOVAL_MAX_NUMBER = 100_000;
 
 export const OPERATION_ID_FILES_FOR_REMOVAL_MAX_NUMBER = 100;