diff --git a/.github/workflows/cicd-base.yaml b/.github/workflows/cicd-base.yaml
deleted file mode 100644
index 910e0b2e..00000000
--- a/.github/workflows/cicd-base.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: CICD-base
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-jobs:
-  CICD-base:
-    runs-on: ubuntu-latest
-
-    timeout-minutes: 15
-
-    steps:
-      # Checkout codebase
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      # Run CICD-base
-      - name: CICD-base
-        uses: docker://ghcr.io/uclahs-cds/cicd-base:latest
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
new file mode 100644
index 00000000..39e983b7
--- /dev/null
+++ b/.github/workflows/static-analysis.yml
@@ -0,0 +1,18 @@
+---
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  # Eventually this will be renamed to static-analysis
+  CICD-base:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: uclahs-cds/tool-static-analysis@v1