diff --git a/.travis.yml b/.travis.yml
index 0804243db5..f374e0adf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-if: (branch = development) OR (branch = master) OR (type = pull_request) OR (tag IS present)
+if: (branch = development) OR (branch = master) OR (feature/#1353-xDai-compatibility) OR (type = pull_request) OR (tag IS present)
 sudo: required
 dist: bionic
 language: node_js
@@ -16,6 +16,10 @@ matrix:
     - env:
         - REACT_APP_NETWORK='rinkeby'
         - REACT_APP_GNOSIS_APPS_URL=${REACT_APP_GNOSIS_APPS_URL_STAGING}
+    - env:
+        - REACT_APP_NETWORK='xdai'
+        - STAGING_BUCKET_NAME=${STAGING_XDAI_BUCKET_NAME}
+      if: ((branch = master OR branch = feature/#1353-xDai-compatibility) AND NOT type = pull_request) OR tag IS present
 cache:
   yarn: true
 before_script:
@@ -62,7 +66,9 @@ deploy:
     upload-dir: current/app
     region: $AWS_DEFAULT_REGION
     on:
-      branch: master
+      # branch: master
+      all_branches: true
+      condition: $TRAVIS_BRANCH =~ ^(master|feature/#1353-xDai-compatibility)$
 
     # Prepare production deployment
   - provider: s3
diff --git a/src/config/networks/xdai.ts b/src/config/networks/xdai.ts
index 86dd160429..f881636c57 100644
--- a/src/config/networks/xdai.ts
+++ b/src/config/networks/xdai.ts
@@ -1,15 +1,24 @@
-import { ETHEREUM_NETWORK, NetworkConfig } from 'src/config/networks/network.d'
+import { EnvironmentSettings, ETHEREUM_NETWORK, NetworkConfig } from 'src/config/networks/network.d'
+
+const baseConfig: EnvironmentSettings = {
+  txServiceUrl: 'https://safe-transaction.xdai.gnosis.io/api/v1',
+  safeAppsUrl: 'http://safe-apps-xdai.staging.gnosisdev.com',
+  gasPrice: 1e9,
+  rpcServiceUrl: 'https://rpc.xdaichain.com',
+  networkExplorerName: 'Blockscout',
+  networkExplorerUrl: 'https://blockscout.com/poa/xdai',
+  networkExplorerApiUrl: 'https://blockscout.com/poa/xdai/api',
+}
 
 const xDai: NetworkConfig = {
   environment: {
+    staging: {
+      ...baseConfig
+    },
     production: {
-      txServiceUrl: 'https://safe-transaction.xdai.gnosis.io/api/v1',
-      safeAppsUrl: 'https://apps.gnosis-safe.io',
-      gasPrice: 1e9,
-      rpcServiceUrl: 'https://rpc.xdaichain.com',
-      networkExplorerName: 'Blockscout',
-      networkExplorerUrl: 'https://blockscout.com/poa/xdai',
-      networkExplorerApiUrl: 'https://blockscout.com/poa/xdai/api',
+      ...baseConfig,
+      safeAppsUrl: 'http://apps-xdai.gnosis-safe.io',
+
     },
   },
   network: {