diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 24f767a..57a0fba 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -63,11 +63,18 @@ jobs:
       - name: Show services
         run: docker compose ps -a
 
+      # The init container is configured to restart 3 times on failure, but
+      # docker wait only uses the first exit code. This container's entrypoint
+      # always fails on its first attempt, but usually one retry is sufficient.
       - name: Wait for init to complete
-        run: |
-          CONTAINER_EXIT_CODE=$(docker wait faros-community-edition-faros-init-1)
-          echo "Faros init container exit code was ${CONTAINER_EXIT_CODE}"
-          [[ $CONTAINER_EXIT_CODE -eq 0 ]]
+        uses: nick-fields/retry@v3
+        with:
+          max_attempts: 2
+          timeout_minutes: 5
+          command: |
+            CONTAINER_EXIT_CODE=$(docker wait faros-community-edition-faros-init-1)
+            echo "Faros init container exit code was ${CONTAINER_EXIT_CODE}"
+            [[ $CONTAINER_EXIT_CODE -eq 0 ]]
 
       - name: Get Hasura Admin Secret
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 60ec2c0..a034cb9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -83,11 +83,16 @@ jobs:
       - name: Show services
         run: docker compose ps -a
 
+      # See comment on same step in PR workflow
       - name: Wait for init to complete
-        run: |
-          CONTAINER_EXIT_CODE=$(docker wait faros-community-edition-faros-init-1)
-          echo "Faros init container exit code was ${CONTAINER_EXIT_CODE}"
-          [[ $CONTAINER_EXIT_CODE -eq 0 ]]
+        uses: nick-fields/retry@v3
+        with:
+          max_attempts: 2
+          timeout_minutes: 5
+          command: |
+            CONTAINER_EXIT_CODE=$(docker wait faros-community-edition-faros-init-1)
+            echo "Faros init container exit code was ${CONTAINER_EXIT_CODE}"
+            [[ $CONTAINER_EXIT_CODE -eq 0 ]]
 
       - name: Get Hasura Admin Secret
         run: |
diff --git a/cli/package-lock.json b/cli/package-lock.json
index c9b7707..8b5bfb3 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -52,7 +52,7 @@
         "eslint": "^8.7.0",
         "eslint-plugin-simple-import-sort": "^7.0.0",
         "jest": "^27.5.1",
-        "nock": "^13.2.4",
+        "nock": "^13.5.1",
         "pino-pretty": "^7.5.1",
         "prettier": "2.5.1",
         "ts-jest": "^27.1.3",
@@ -4909,12 +4909,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.set": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=",
-      "dev": true
-    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -5109,14 +5103,13 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "node_modules/nock": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.2.4.tgz",
-      "integrity": "sha512-8GPznwxcPNCH/h8B+XZcKjYPXnUV5clOKCjAqyjsiqA++MpNx9E9+t8YPp0MbThO+KauRo7aZJ1WuIZmOrT2Ug==",
+      "version": "13.5.1",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.1.tgz",
+      "integrity": "sha512-+s7b73fzj5KnxbKH4Oaqz07tQ8degcMilU4rrmnKvI//b0JMBU4wEXFQ8zqr+3+L4eWSfU3H/UoIVGUV0tue1Q==",
       "dev": true,
       "dependencies": {
         "debug": "^4.1.0",
         "json-stringify-safe": "^5.0.1",
-        "lodash.set": "^4.3.2",
         "propagate": "^2.0.0"
       },
       "engines": {
@@ -10511,12 +10504,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.set": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=",
-      "dev": true
-    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -10662,14 +10649,13 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "nock": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.2.4.tgz",
-      "integrity": "sha512-8GPznwxcPNCH/h8B+XZcKjYPXnUV5clOKCjAqyjsiqA++MpNx9E9+t8YPp0MbThO+KauRo7aZJ1WuIZmOrT2Ug==",
+      "version": "13.5.1",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.1.tgz",
+      "integrity": "sha512-+s7b73fzj5KnxbKH4Oaqz07tQ8degcMilU4rrmnKvI//b0JMBU4wEXFQ8zqr+3+L4eWSfU3H/UoIVGUV0tue1Q==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
         "json-stringify-safe": "^5.0.1",
-        "lodash.set": "^4.3.2",
         "propagate": "^2.0.0"
       }
     },
diff --git a/cli/package.json b/cli/package.json
index 92b8975..117362d 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -66,7 +66,7 @@
     "eslint": "^8.7.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "jest": "^27.5.1",
-    "nock": "^13.2.4",
+    "nock": "^13.5.1",
     "pino-pretty": "^7.5.1",
     "prettier": "2.5.1",
     "ts-jest": "^27.1.3",
diff --git a/init/package-lock.json b/init/package-lock.json
index 1fd4546..36dd0c6 100644
--- a/init/package-lock.json
+++ b/init/package-lock.json
@@ -43,7 +43,7 @@
         "eslint": "^8.7.0",
         "eslint-plugin-simple-import-sort": "^7.0.0",
         "jest": "^29.7.0",
-        "nock": "^13.2.4",
+        "nock": "^13.5.1",
         "pino-pretty": "^7.5.1",
         "prettier": "2.5.1",
         "ts-jest": "^29.1.1",
@@ -4186,12 +4186,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.set": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=",
-      "dev": true
-    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -4368,14 +4362,13 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "node_modules/nock": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.2.4.tgz",
-      "integrity": "sha512-8GPznwxcPNCH/h8B+XZcKjYPXnUV5clOKCjAqyjsiqA++MpNx9E9+t8YPp0MbThO+KauRo7aZJ1WuIZmOrT2Ug==",
+      "version": "13.5.1",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.1.tgz",
+      "integrity": "sha512-+s7b73fzj5KnxbKH4Oaqz07tQ8degcMilU4rrmnKvI//b0JMBU4wEXFQ8zqr+3+L4eWSfU3H/UoIVGUV0tue1Q==",
       "dev": true,
       "dependencies": {
         "debug": "^4.1.0",
         "json-stringify-safe": "^5.0.1",
-        "lodash.set": "^4.3.2",
         "propagate": "^2.0.0"
       },
       "engines": {
@@ -8814,12 +8807,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.set": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=",
-      "dev": true
-    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -8954,14 +8941,13 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "nock": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-13.2.4.tgz",
-      "integrity": "sha512-8GPznwxcPNCH/h8B+XZcKjYPXnUV5clOKCjAqyjsiqA++MpNx9E9+t8YPp0MbThO+KauRo7aZJ1WuIZmOrT2Ug==",
+      "version": "13.5.1",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.1.tgz",
+      "integrity": "sha512-+s7b73fzj5KnxbKH4Oaqz07tQ8degcMilU4rrmnKvI//b0JMBU4wEXFQ8zqr+3+L4eWSfU3H/UoIVGUV0tue1Q==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
         "json-stringify-safe": "^5.0.1",
-        "lodash.set": "^4.3.2",
         "propagate": "^2.0.0"
       }
     },
diff --git a/init/package.json b/init/package.json
index c64fba0..027819b 100644
--- a/init/package.json
+++ b/init/package.json
@@ -57,7 +57,7 @@
     "eslint": "^8.7.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "jest": "^29.7.0",
-    "nock": "^13.2.4",
+    "nock": "^13.5.1",
     "pino-pretty": "^7.5.1",
     "prettier": "2.5.1",
     "ts-jest": "^29.1.1",