diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc
index df597ec..faa0208 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -11,7 +11,7 @@
 	   file://osmo-bsc.init \
 	   file://osmo-sgsn.init"
 
-INC_PR = "r20.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r21.${META_TELEPHONY_OSMO_INC}"
 
 
 EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729"
@@ -51,6 +51,9 @@
 
 INITSCRIPT_PACKAGES = "osmo-bsc osmo-bsc-mgcp osmo-nitb osmo-sgsn"
 
+# Do not start any of the services by default
+SYSTEMD_AUTO_ENABLE = "disable"
+
 CONFFILES_osmo-bsc = "${sysconfdir}/osmocom/osmo-bsc.cfg"
 INITSCRIPT_NAME_osmo-bsc = "osmo-bsc"
 INITSCRIPT_PARAMS_osmo-bsc = "defaults 30 30"