diff --git a/build.gradle b/build.gradle
index 53da063f28b974efe3a47138b6cb13719217d5a5..7e05b7644889851bcdcbb43ef3a444f1f4c6c346 100644
--- a/build.gradle
+++ b/build.gradle
@@ -219,8 +219,8 @@ task zipAssets(dependsOn: [prepareSoundAssets, prepareGraphicAssets, prepareJson
 
 task processAssets(dependsOn: [':util:checksum:runChecksum', ':util:checksum:runAssetsArchivesChecksum']) {
     doLast {
-        if (project.hasProperty('TABLEXIA_ASSETS_SERVER_USER') && project.hasProperty('TABLEXIA_ASSETS_SERVER_URL')) {
-            def data = new URL(ASSETS_DOWNLOAD_URL).getText()
+        if (project.hasProperty('TABLEXIA_ASSETS_UPLOAD_USER') && project.hasProperty('TABLEXIA_ASSETS_UPLOAD_URL')) {
+            def data = new URL("${TABLEXIA_ASSETS_DOWNLOAD_URL}").getText()
             rootProject.ext.assetsPackDir.eachFile() { file ->
                 String fileName = file.getName()
                 String[] fileNameParts = fileName.split("_SNAPSHOT\\.");
@@ -232,7 +232,7 @@ task processAssets(dependsOn: [':util:checksum:runChecksum', ':util:checksum:run
                     println "AssetsUploader: UPLOADING FILE: ${uploadFileName}"
                     task ("${name}_${packageName}", type:Exec) {
                         workingDir "${rootProject.projectDir}"
-                        commandLine 'scp', file.getAbsolutePath(), "${TABLEXIA_ASSETS_SERVER_USER}@${TABLEXIA_ASSETS_SERVER_URL}/${uploadFileName}"
+                        commandLine 'scp', file.getAbsolutePath(), "${TABLEXIA_ASSETS_UPLOAD_USER}@${TABLEXIA_ASSETS_UPLOAD_URL}/${uploadFileName}"
                         standardOutput = new ByteArrayOutputStream()
                         ext.output = {
                             return standardOutput.toString()
diff --git a/core/build.gradle b/core/build.gradle
index e58a0338dd941c5b856a01a7341c6c0e3edc8ff1..c2f5180bd22a4fc4d84c073e1ab258432c687f11 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -36,10 +36,11 @@ task writeTablexiaBuildConfig {
                 "\n" +
                 "    public final static String  VERSION_NAME = \"${tablexiaVersionName}\";\n" +
                 "    public final static String  ASSETS_CHECKSUM = \"${getMapConvertedToString(rootProject.ext.assetsChecksum)}\";\n" +
+                "    public final static String  TABLEXIA_ASSETS_URL = ${project.hasProperty('TABLEXIA_ASSETS_DOWNLOAD_URL') ? "\"$TABLEXIA_ASSETS_DOWNLOAD_URL\"" : "null"};\n" +
                 "    public final static String  TABLEXIA_SERVER_PROTOCOL = ${project.hasProperty('TABLEXIA_SERVER_PROTOCOL') ? "\"$TABLEXIA_SERVER_PROTOCOL\"" : "null"};\n" +
                 "    public final static String  TABLEXIA_SERVER_HOST = ${project.hasProperty('TABLEXIA_SERVER_HOST') ? "\"$TABLEXIA_SERVER_HOST\"" : "null"};\n" +
                 "    public final static Integer TABLEXIA_SERVER_PORT = ${project.hasProperty('TABLEXIA_SERVER_PORT') ? "$TABLEXIA_SERVER_PORT" : "null"};\n" +
-                "    public final static String TABLEXIA_SERVER_SECRET = ${project.hasProperty('TABLEXIA_SERVER_SECRET') ? "\"$TABLEXIA_SERVER_SECRET\"" : "null"};\n" +
+                "    public final static String  TABLEXIA_SERVER_SECRET = ${project.hasProperty('TABLEXIA_SERVER_SECRET') ? "\"$TABLEXIA_SERVER_SECRET\"" : "null"};\n" +
                 "    public final static String  FLURRY_KEY = ${project.hasProperty('TABLEXIA_FLURRY_KEY') ? "\"$TABLEXIA_FLURRY_KEY\"" : "null"};\n" +
                 "\n" +
                 "}", BUILD_CONFIG_FILE_ENCODING)
diff --git a/core/src/cz/nic/tablexia/loader/zip/ZipAssetLoader.java b/core/src/cz/nic/tablexia/loader/zip/ZipAssetLoader.java
index 15dcc8e82b1d167764a7ad4a21baeb507ad2054f..3f4808777f888ffb0478c7ab242cab8f775f1cb3 100644
--- a/core/src/cz/nic/tablexia/loader/zip/ZipAssetLoader.java
+++ b/core/src/cz/nic/tablexia/loader/zip/ZipAssetLoader.java
@@ -23,6 +23,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import cz.nic.tablexia.Tablexia;
+import cz.nic.tablexia.TablexiaBuildConfig;
 import cz.nic.tablexia.bus.ApplicationBus;
 import cz.nic.tablexia.checksum.Checksum;
 import cz.nic.tablexia.loader.IApplicationLoader;
@@ -44,7 +45,7 @@ public class ZipAssetLoader extends TablexiaDataManager<Void> implements IApplic
     public static final TablexiaAbstractFileManager.StorageType     ZIP_FILES_STORAGE_TYPE              = TablexiaAbstractFileManager.DownloadStorageType.EXTERNAL;
     public static final String                                      ZIP_FILE_EXTENSION                  = ".zip";
     public static final String                                      CHECKSUM_FILE_EXTENSION             = ".checksum";
-    private static final String                                     TABLEXIA_ASSETS_DOWNLOAD_BASE_PATH  = "https://www.tablexia.cz/static/assets/";
+    private static final String                                     TABLEXIA_ASSETS_DOWNLOAD_BASE_PATH  = TablexiaBuildConfig.TABLEXIA_ASSETS_URL + "/";
     private static final int                                        TABLEXIA_ASSETS_DOWNLOAD_TIMEOUT    = 2500;
     private static final String                                     TABLEXIA_TRUST_KEYSTORE_NAME        = "tablexiaTrustKeystore";
     private static final String                                     TABLEXIA_TRUST_KEYSTORE_PASSWORD    = "tablexia";