diff --git a/src/finit.c b/src/finit.c
index 82e333f9..d3d0bd25 100644
--- a/src/finit.c
+++ b/src/finit.c
@@ -697,7 +697,7 @@ int main(int argc, char *argv[])
 
 	/* Some bootstrap tasks may need to know if we're in a container. */
 	if (in_container())
-		cond_set("int/container");
+		cond_set_oneshot("int/container");
 
 	/*
 	 * Initialize .conf system and load static /etc/finit.conf then
diff --git a/src/sm.c b/src/sm.c
index 3d7c550b..bdaa1c6c 100644
--- a/src/sm.c
+++ b/src/sm.c
@@ -216,7 +216,7 @@ restart:
 		service_step_all(SVC_TYPE_ANY);
 
 		/* Allow runparts to start */
-		cond_set("int/bootstrap");
+		cond_set_oneshot("int/bootstrap");
 
 		if (sm->newlevel == -1)
 			break;