--- a/specs/repositories.rbspec	Sun Nov 27 22:57:33 2016 +0000
+++ b/specs/repositories.rbspec	Sun Dec 04 22:21:22 2016 +0000
@@ -18,8 +18,9 @@
 #    on https://swing.fit.cvut.cz/hg in addition to canonical on hosted on 
 #    BitBucket.
 #
-#  3."ci-jv": for use on Jan Vrany's private CI. Uses local staging repositories 
-#    in addition to canonical on hosted on BitBucket.
+#  3."ci-jv": for use on Jan Vrany's private CI. Uses (his) local staging repositories 
+#    and repositories hosted at SWING as upstream repos. 
+#    
 #
 REPOSITORYSET = (ENV['REPOSITORYSET'] || 'default') if not defined? REPOSITORYSET
 
@@ -47,19 +48,21 @@
 when 'ci-swing'
   repository :'exept:public' do
     type :cvs    
-    canonical ":ext:swing.fit.cvut.cz/var/local/cvs"
+    canonical ":ext:#{ENV['USER'] || ENV['USERNAME']}@swing.fit.cvut.cz/var/local/cvs"
   end
 
   repository :'bitbucket:janvrany' do
     type :hg
     canonical "https://bitbucket.org/janvrany"
-    staging "ssh://swing.fit.cvut.cz//var/local/hg"
+    # Use local build slave network address to allow for faster
+    # checkouts
+    staging "ssh://#{ENV['USER'] || ENV['USERNAME']}@192.168.12.1//var/local/hg"
     separator '-'
   end
 
   repository :'swing:private:hg' do
     type :hg
-    canonical "ssh://192.168.12.2//hg"
+    canonical "ssh://#{ENV['USER'] || ENV['USERNAME']}@192.168.12.2//hg"
     separator '.'
   end
 
@@ -73,13 +76,20 @@
   repository :'bitbucket:janvrany' do
     type :hg
     canonical "https://bitbucket.org/janvrany"
-    staging "ssh://hg@192.168.0.250"
+    upstream  "ssh://hg@swing.fit.cvut.cz//var/local/hg"
+    staging   "ssh://hg@192.168.0.250"
     separator '-'
   end
 
   repository :'swing:private:hg' do
     type :hg
+    # No, don't do this - CI has no access to those
+    # SWING repositories (no VPN, no keys set up)
+    #
+    # canonical "ssh://192.168.12.2//hg"
+    # staging   "ssh://hg@192.168.0.250"
+    
     canonical "ssh://hg@192.168.0.250"
     separator '-'
   end
-end
\ No newline at end of file
+end