diff --git a/deployment/overlays/production/configmap.yaml b/deployment/overlays/production/configmap.yaml
index 00f87e4b..cfb9b43b 100644
--- a/deployment/overlays/production/configmap.yaml
+++ b/deployment/overlays/production/configmap.yaml
@@ -13,15 +13,12 @@ data:
   ES_NODE_URL: https://104.248.94.114:9200
   ES_OFFCHAIN_USER: elastic
   ES_READONLY_USER: elastic
-  FAUCET_DRIP_AMOUNT: "0.05"
-  FAUCET_MAX_AMOUNT_TOP_UP: "0.025"
-  FAUCET_MNEMONIC: ""
-  IPFS_CLUSTER_URL: http://new-ipfs-cluster:9094
   IPFS_GATEWAY_URL: https://ipfs.subsocial.network
   IPFS_MAX_FILE_SIZE_BYTES: "2097152"
-  IPFS_NODE_URL: http://new-ipfs-cluster:5001
-  IPFS_READ_ONLY_NODE_URL: http://new-ipfs-cluster:8080
-  IPFS_CRUST_AUTH: ''
+#  IPFS_CLUSTER_URL: http://new-ipfs-cluster:9094
+#  IPFS_NODE_URL: http://new-ipfs-cluster:5001
+#  IPFS_READ_ONLY_NODE_URL: http://new-ipfs-cluster:8080
+#  IPFS_AUTH: ''
   KUSAMA_NODE_URL: wss://kusama-rpc.polkadot.io
   LOG_LEVEL: info
   MAX_RESULTS_LIMIT: "20"
diff --git a/deployment/overlays/staging/configmap.yaml b/deployment/overlays/staging/configmap.yaml
index 6cfb86ec..325c738e 100644
--- a/deployment/overlays/staging/configmap.yaml
+++ b/deployment/overlays/staging/configmap.yaml
@@ -13,15 +13,12 @@ data:
   ES_NODE_URL: https://10.110.0.2:9200
   ES_OFFCHAIN_USER: elastic
   ES_READONLY_USER: elastic
-  FAUCET_DRIP_AMOUNT: "0.05"
-  FAUCET_MAX_AMOUNT_TOP_UP: "0.025"
-  FAUCET_MNEMONIC: ""
-  IPFS_CLUSTER_URL: https://test-pin.crustcloud.io/psa
-  IPFS_GATEWAY_URL: https://ipfs.subsocial.network
   IPFS_MAX_FILE_SIZE_BYTES: "2097152"
-  IPFS_NODE_URL: https://gw-seattle.crustcloud.io
-  IPFS_READ_ONLY_NODE_URL: https://ipfs.subsocial.network
-  IPFS_CRUST_AUTH: eyJkYXRhIjp7ImRvbWFpbiI6eyJjaGFpbklkIjoiNSIsIm5hbWUiOiJDbG91ZDMuY2MiLCJ2ZXJpZnlpbmdDb250cmFjdCI6IjB4Q2NDQ2NjY2NDQ0NDY0NDQ0NDQ2NDY0NjY0NjQ0NDY0NjY2NjY2NjQyIsInZlcnNpb24iOiIxIn0sIm1lc3NhZ2UiOnsiZGVzY3JpcHRpb24iOiJTaWduIGZvciBXMyBCdWNrZXQgQWNjZXNzIEF1dGhlbnRpY2F0aW9uIiwic2lnbmluZ0FkZHJlc3MiOiIweDAwNDFjNzA1ZTEwNmVlOWRFMjI3Q2ExMzlBZDRBOTlEQjY0NENCM2EiLCJ0b2tlbkFkZHJlc3MiOiIweDM5ODY2Mzg0MjY4MDMzMkExQWJBM0IwM2JkNmRCNDdhRTk4NDk5NEMiLCJ0b2tlbklkIjoiMzAwMDAzNyIsImVmZmVjdGl2ZVRpbWVzdGFtcCI6MTY3ODUzNzYxNywiZXhwaXJhdGlvblRpbWVzdGFtcCI6MH0sInByaW1hcnlUeXBlIjoiVzNCdWNrZXQiLCJ0eXBlcyI6eyJXM0J1Y2tldCI6W3sibmFtZSI6ImRlc2NyaXB0aW9uIiwidHlwZSI6InN0cmluZyJ9LHsibmFtZSI6InNpZ25pbmdBZGRyZXNzIiwidHlwZSI6ImFkZHJlc3MifSx7Im5hbWUiOiJ0b2tlbkFkZHJlc3MiLCJ0eXBlIjoiYWRkcmVzcyJ9LHsibmFtZSI6InRva2VuSWQiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW1lIjoiZWZmZWN0aXZlVGltZXN0YW1wIiwidHlwZSI6InVpbnQyNTYifSx7Im5hbWUiOiJleHBpcmF0aW9uVGltZXN0YW1wIiwidHlwZSI6InVpbnQyNTYifV19fSwic2lnbmF0dXJlIjoiMHhhMTUxODkyZGNhMTZlMTJkZmViYTFjY2FkMjNmZjM5MGVmODQ1MzdhMGI2MWI4YWQ1NDY1ZGI1ZjI1NjZkMWJmMjc3MGE1OTQyMzFmNzFmYzA5YWVlZGJhNzJkZjM5Y2Y4NDIxMTQ3YzJkNWQyNTFkNDZjNGQyMDFlOGM1MmUzZTFjIn0=
+  IPFS_GATEWAY_URL: https://ipfs.subsocial.network
+#  IPFS_CLUSTER_URL: https://test-pin.crustcloud.io/psa
+#  IPFS_NODE_URL: https://gw-seattle.crustcloud.io
+#  IPFS_READ_ONLY_NODE_URL: https://ipfs.subsocial.network
+#  IPFS_AUTH: eyJkYXRhIjp7ImRvbWFpbiI6eyJjaGFpbklkIjoiNSIsIm5hbWUiOiJDbG91ZDMuY2MiLCJ2ZXJpZnlpbmdDb250cmFjdCI6IjB4Q2NDQ2NjY2NDQ0NDY0NDQ0NDQ2NDY0NjY0NjQ0NDY0NjY2NjY2NjQyIsInZlcnNpb24iOiIxIn0sIm1lc3NhZ2UiOnsiZGVzY3JpcHRpb24iOiJTaWduIGZvciBXMyBCdWNrZXQgQWNjZXNzIEF1dGhlbnRpY2F0aW9uIiwic2lnbmluZ0FkZHJlc3MiOiIweDAwNDFjNzA1ZTEwNmVlOWRFMjI3Q2ExMzlBZDRBOTlEQjY0NENCM2EiLCJ0b2tlbkFkZHJlc3MiOiIweDM5ODY2Mzg0MjY4MDMzMkExQWJBM0IwM2JkNmRCNDdhRTk4NDk5NEMiLCJ0b2tlbklkIjoiMzAwMDAzNyIsImVmZmVjdGl2ZVRpbWVzdGFtcCI6MTY3ODUzNzYxNywiZXhwaXJhdGlvblRpbWVzdGFtcCI6MH0sInByaW1hcnlUeXBlIjoiVzNCdWNrZXQiLCJ0eXBlcyI6eyJXM0J1Y2tldCI6W3sibmFtZSI6ImRlc2NyaXB0aW9uIiwidHlwZSI6InN0cmluZyJ9LHsibmFtZSI6InNpZ25pbmdBZGRyZXNzIiwidHlwZSI6ImFkZHJlc3MifSx7Im5hbWUiOiJ0b2tlbkFkZHJlc3MiLCJ0eXBlIjoiYWRkcmVzcyJ9LHsibmFtZSI6InRva2VuSWQiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW1lIjoiZWZmZWN0aXZlVGltZXN0YW1wIiwidHlwZSI6InVpbnQyNTYifSx7Im5hbWUiOiJleHBpcmF0aW9uVGltZXN0YW1wIiwidHlwZSI6InVpbnQyNTYifV19fSwic2lnbmF0dXJlIjoiMHhhMTUxODkyZGNhMTZlMTJkZmViYTFjY2FkMjNmZjM5MGVmODQ1MzdhMGI2MWI4YWQ1NDY1ZGI1ZjI1NjZkMWJmMjc3MGE1OTQyMzFmNzFmYzA5YWVlZGJhNzJkZjM5Y2Y4NDIxMTQ3YzJkNWQyNTFkNDZjNGQyMDFlOGM1MmUzZTFjIn0=
   KUSAMA_NODE_URL: wss://kusama-rpc.polkadot.io
   LOG_LEVEL: info
   MAX_RESULTS_LIMIT: "20"
diff --git a/localhost.env b/localhost.env
index a8e938c8..95ef384c 100644
--- a/localhost.env
+++ b/localhost.env
@@ -20,7 +20,7 @@ ES_NODE_URL='https://104.248.94.114:9200'
 IPFS_NODE_URL='https://gw-seattle.crustcloud.io'
 IPFS_READ_ONLY_NODE_URL='https://ipfs.subsocial.network'
 IPFS_CLUSTER_URL='https://test-pin.crustcloud.io/psa'
-IPFS_CRUST_AUTH='eyJkYXRhIjp7ImRvbWFpbiI6eyJjaGFpbklkIjoiNSIsIm5hbWUiOiJDbG91ZDMuY2MiLCJ2ZXJpZnlpbmdDb250cmFjdCI6IjB4Q2NDQ2NjY2NDQ0NDY0NDQ0NDQ2NDY0NjY0NjQ0NDY0NjY2NjY2NjQyIsInZlcnNpb24iOiIxIn0sIm1lc3NhZ2UiOnsiZGVzY3JpcHRpb24iOiJTaWduIGZvciBXMyBCdWNrZXQgQWNjZXNzIEF1dGhlbnRpY2F0aW9uIiwic2lnbmluZ0FkZHJlc3MiOiIweDAwNDFjNzA1ZTEwNmVlOWRFMjI3Q2ExMzlBZDRBOTlEQjY0NENCM2EiLCJ0b2tlbkFkZHJlc3MiOiIweDM5ODY2Mzg0MjY4MDMzMkExQWJBM0IwM2JkNmRCNDdhRTk4NDk5NEMiLCJ0b2tlbklkIjoiMzAwMDAzNyIsImVmZmVjdGl2ZVRpbWVzdGFtcCI6MTY3ODUzNzYxNywiZXhwaXJhdGlvblRpbWVzdGFtcCI6MH0sInByaW1hcnlUeXBlIjoiVzNCdWNrZXQiLCJ0eXBlcyI6eyJXM0J1Y2tldCI6W3sibmFtZSI6ImRlc2NyaXB0aW9uIiwidHlwZSI6InN0cmluZyJ9LHsibmFtZSI6InNpZ25pbmdBZGRyZXNzIiwidHlwZSI6ImFkZHJlc3MifSx7Im5hbWUiOiJ0b2tlbkFkZHJlc3MiLCJ0eXBlIjoiYWRkcmVzcyJ9LHsibmFtZSI6InRva2VuSWQiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW1lIjoiZWZmZWN0aXZlVGltZXN0YW1wIiwidHlwZSI6InVpbnQyNTYifSx7Im5hbWUiOiJleHBpcmF0aW9uVGltZXN0YW1wIiwidHlwZSI6InVpbnQyNTYifV19fSwic2lnbmF0dXJlIjoiMHhhMTUxODkyZGNhMTZlMTJkZmViYTFjY2FkMjNmZjM5MGVmODQ1MzdhMGI2MWI4YWQ1NDY1ZGI1ZjI1NjZkMWJmMjc3MGE1OTQyMzFmNzFmYzA5YWVlZGJhNzJkZjM5Y2Y4NDIxMTQ3YzJkNWQyNTFkNDZjNGQyMDFlOGM1MmUzZTFjIn0='
+IPFS_AUTH='eyJkYXRhIjp7ImRvbWFpbiI6eyJjaGFpbklkIjoiNSIsIm5hbWUiOiJDbG91ZDMuY2MiLCJ2ZXJpZnlpbmdDb250cmFjdCI6IjB4Q2NDQ2NjY2NDQ0NDY0NDQ0NDQ2NDY0NjY0NjQ0NDY0NjY2NjY2NjQyIsInZlcnNpb24iOiIxIn0sIm1lc3NhZ2UiOnsiZGVzY3JpcHRpb24iOiJTaWduIGZvciBXMyBCdWNrZXQgQWNjZXNzIEF1dGhlbnRpY2F0aW9uIiwic2lnbmluZ0FkZHJlc3MiOiIweDAwNDFjNzA1ZTEwNmVlOWRFMjI3Q2ExMzlBZDRBOTlEQjY0NENCM2EiLCJ0b2tlbkFkZHJlc3MiOiIweDM5ODY2Mzg0MjY4MDMzMkExQWJBM0IwM2JkNmRCNDdhRTk4NDk5NEMiLCJ0b2tlbklkIjoiMzAwMDAzNyIsImVmZmVjdGl2ZVRpbWVzdGFtcCI6MTY3ODUzNzYxNywiZXhwaXJhdGlvblRpbWVzdGFtcCI6MH0sInByaW1hcnlUeXBlIjoiVzNCdWNrZXQiLCJ0eXBlcyI6eyJXM0J1Y2tldCI6W3sibmFtZSI6ImRlc2NyaXB0aW9uIiwidHlwZSI6InN0cmluZyJ9LHsibmFtZSI6InNpZ25pbmdBZGRyZXNzIiwidHlwZSI6ImFkZHJlc3MifSx7Im5hbWUiOiJ0b2tlbkFkZHJlc3MiLCJ0eXBlIjoiYWRkcmVzcyJ9LHsibmFtZSI6InRva2VuSWQiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW1lIjoiZWZmZWN0aXZlVGltZXN0YW1wIiwidHlwZSI6InVpbnQyNTYifSx7Im5hbWUiOiJleHBpcmF0aW9uVGltZXN0YW1wIiwidHlwZSI6InVpbnQyNTYifV19fSwic2lnbmF0dXJlIjoiMHhhMTUxODkyZGNhMTZlMTJkZmViYTFjY2FkMjNmZjM5MGVmODQ1MzdhMGI2MWI4YWQ1NDY1ZGI1ZjI1NjZkMWJmMjc3MGE1OTQyMzFmNzFmYzA5YWVlZGJhNzJkZjM5Y2Y4NDIxMTQ3YzJkNWQyNTFkNDZjNGQyMDFlOGM1MmUzZTFjIn0='
 
 # Max size (in MB) of a file that can be added to our IPFS node.
 IPFS_MAX_FILE_SIZE_BYTES=2097152
diff --git a/src/env.ts b/src/env.ts
index 28842cfc..2c5f9793 100644
--- a/src/env.ts
+++ b/src/env.ts
@@ -5,7 +5,7 @@ export const substrateNodeUrl = process.env.SUBSTRATE_URL
 export const ipfsReadOnlyNodeUrl = process.env.IPFS_READ_ONLY_NODE_URL || 'http://localhost:8080'
 export const ipfsNodeUrl = process.env.IPFS_NODE_URL || 'http://localhost:5001'
 export const ipfsClusterUrl = process.env.IPFS_CLUSTER_URL || 'http://localhost:9094'
-export const crustIpfsAuth = process.env.IPFS_CRUST_AUTH || ''
+export const ipfsAuthHeader = process.env.IPFS_AUTH || ''
 export const port = process.env.OFFCHAIN_SERVER_PORT || 3001
 
 export const corsAllowedList = process.env.CORS_ALLOWED_ORIGIN.split(',')
diff --git a/src/ipfs/index.ts b/src/ipfs/index.ts
index d6dd5e66..e0eb5750 100644
--- a/src/ipfs/index.ts
+++ b/src/ipfs/index.ts
@@ -1,11 +1,10 @@
 import { SubsocialIpfsApi } from '@subsocial/api'
-import {crustIpfsAuth, ipfsClusterUrl, ipfsNodeUrl, ipfsReadOnlyNodeUrl} from "../env";
+import {ipfsAuthHeader, ipfsClusterUrl, ipfsNodeUrl, ipfsReadOnlyNodeUrl} from "../env";
 
 function getIpfsApi() {
-  const writeHeaders = crustIpfsAuth ? { authorization: crustIpfsAuth } : {}
-  const props = crustIpfsAuth ? { asLink: false, 'meta.gatewayId': 1 } : { asLink: true }
-
-  console.log(props)
+  const writeHeaders = { authorization: ipfsAuthHeader }
+  const isCrust = false
+  const props = isCrust ? { asLink: false, 'meta.gatewayId': 1 } : { asLink: true }
 
   const ipfs = new SubsocialIpfsApi({
     ipfsNodeUrl: ipfsReadOnlyNodeUrl,