diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp
index b00e7e8..77b3cca 100644
--- a/modules/rhizo_base/manifests/openbsc.pp
+++ b/modules/rhizo_base/manifests/openbsc.pp
@@ -141,8 +141,22 @@ class rhizo_base::openbsc {
          notify  => Service['osmo-sgsn'],
       }
 
+    $sgsn_version = $repo ? {
+      'latest'    => '1.6.0+rhizo1',
+      'nightly'   => 'latest',
+      default     => 'installed',
+     }
+
     package {  [ 'osmo-sgsn' ]:
-        ensure   => 'installed',
+        ensure   => $sgsn_version,
+        require  => Class['rhizo_base::apt'],
+      }
+    package { [ 'libosmo-gsup-client0' ]:
+        ensure   => 'latest',
+        require  => Class['rhizo_base::apt'],
+      }
+    package { [ 'libosmocore' ]:
+        ensure   => 'latest',
         require  => Class['rhizo_base::apt'],
       }
   }