diff --git a/pungi/phases/ostree.py b/pungi/phases/ostree.py
index d60bb68f..e08d1767 100644
--- a/pungi/phases/ostree.py
+++ b/pungi/phases/ostree.py
@@ -45,7 +45,10 @@ class OSTreeThread(WorkerThread):
         repodir = os.path.join(workdir, 'config_repo')
 
         source_variant = compose.variants[config['source_repo_from']]
-        source_repo = translate_path(compose, compose.paths.compose.repository(arch, source_variant))
+        source_repo = translate_path(compose,
+                                     compose.paths.compose.repository('$basearch',
+                                                                      source_variant,
+                                                                      create_dir=False))
 
         self._clone_repo(repodir, config['config_url'], config.get('config_branch', 'master'))
         self._tweak_mirrorlist(repodir, source_repo)
diff --git a/tests/test_ostree_phase.py b/tests/test_ostree_phase.py
index dcf583a9..2e4ff169 100755
--- a/tests/test_ostree_phase.py
+++ b/tests/test_ostree_phase.py
@@ -115,7 +115,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
 
         for fp in ['fedora-rawhide.repo', 'fedora-24.repo', 'fedora-24.repo']:
             with open(os.path.join(self.topdir, 'work/ostree-1/config_repo', fp)) as f:
-                self.assertIn('baseurl=http://example.com/Everything/x86_64/os',
+                self.assertIn('baseurl=http://example.com/Everything/$basearch/os',
                               f.read())
         self.assertTrue(os.path.isdir(self.repo))