diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
index 2ade5b5..0e7979a 100644
--- a/.github/workflows/integration-tests.yaml
+++ b/.github/workflows/integration-tests.yaml
@@ -41,23 +41,29 @@ jobs:
         run: tox -vve integration
 
       - name: Gather logs
-        if: always()
+        if: failure()
         run: |
           juju-crashdump -m sdcore
+          juju-crashdump -m ran
           for pod in $(sudo microk8s.kubectl -n sdcore get pods -o json | jq .items[].metadata.name | tr -d '"'); do
-           sudo  microk8s.kubectl -n sdcore logs $pod --all-containers > pod-$pod.log
+            sudo  microk8s.kubectl -n sdcore logs $pod --all-containers > sdcore-$pod.log
+          done
+          for pod in $(sudo microk8s.kubectl -n ran get pods -o json | jq .items[].metadata.name | tr -d '"'); do
+            sudo  microk8s.kubectl -n ran logs $pod --all-containers > ran-$pod.log
           done
 
       - name: Archive juju crashdump
-        if: always()
+        if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: juju-crashdump
           path: juju-crashdump-*.tar.xz
 
       - name: Archive k8s logs
-        if: always()
+        if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: k8s-logs
-          path: pod-*.log
+          path: |
+            sdcore-*.log
+            ran-*.log
diff --git a/terraform/main.tf b/terraform/main.tf
index 15954a2..a2cf344 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -16,7 +16,6 @@ module "sdcore" {
   source = "git::https://github.com/canonical/terraform-juju-sdcore-k8s//modules/sdcore-k8s"
 
   model = juju_model.sdcore.name
-  nms_revision = 786
 
   depends_on = [module.sdcore-router]
 }