diff --git a/dist/bootstrap/index.js b/dist/bootstrap/index.js
index 4700ac3..3be14de 100644
--- a/dist/bootstrap/index.js
+++ b/dist/bootstrap/index.js
@@ -5509,7 +5509,10 @@ function microk8s_init(addons) {
     return __awaiter(this, void 0, void 0, function* () {
         // microk8s needs some additional things done to ensure it's ready for Juju.
         // Add the given addons if any were given.
-        yield exec_as_microk8s("microk8s status --wait-ready");
+        if (!(yield exec_as_microk8s("microk8s status --wait-ready --timeout 900"))) {
+            core.setFailed("microk8s couldn't become ready");
+            return false;
+        }
         if (addons) {
             yield exec_as_microk8s("sudo microk8s enable " + addons);
         }
@@ -5829,4 +5832,4 @@ module.exports = require("util");;
 /******/ 	// Load entry module and return exports
 /******/ 	return __nccwpck_require__(1098);
 /******/ })()
-;
+;
\ No newline at end of file
diff --git a/src/bootstrap/index.ts b/src/bootstrap/index.ts
index d24536f..0bea321 100644
--- a/src/bootstrap/index.ts
+++ b/src/bootstrap/index.ts
@@ -74,7 +74,10 @@ async function retry_until_rc(cmd: string, expected_rc=0, maxRetries=12, timeout
 async function microk8s_init(addons) {
     // microk8s needs some additional things done to ensure it's ready for Juju.
     // Add the given addons if any were given.
-    await exec_as_microk8s("microk8s status --wait-ready");
+    if (! await exec_as_microk8s("microk8s status --wait-ready --timeout 900")){
+        core.setFailed("microk8s couldn't become ready")
+        return false;
+    }
     if (addons) {
         await exec_as_microk8s("sudo microk8s enable " + addons);
     }