diff --git a/.github/workflows/manual.yml b/.github/workflows/build_test.yml
similarity index 97%
rename from .github/workflows/manual.yml
rename to .github/workflows/build_test.yml
index dd15207..ac83256 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/build_test.yml
@@ -5,10 +5,10 @@ name: X17-Surface Build Test
 on:
   push:
     branches:
-      - main
+      - master
   pull_request:
     branches:
-      - main
+      - master
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/python_linter.yml b/.github/workflows/python_linter.yml
new file mode 100644
index 0000000..1145353
--- /dev/null
+++ b/.github/workflows/python_linter.yml
@@ -0,0 +1,42 @@
+name: X17-Surface Python Linter
+
+# Controls when the action will run. 
+# Workflow runs when manually triggered using the UI, or when a push or pull request is made to the main branch
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+permissions:
+  contents: write  # Grant write access to repository contents
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.x'
+
+    - name: Install Black
+      run: |
+        python -m pip install --upgrade pip
+        pip install black
+
+    - name: Run Black to format code
+      run: black .
+
+    - name: Commit changes if there are any
+      run: |
+        git config --local user.name "GitHub Action"
+        git config --local user.email "action@github.com"
+        git diff --exit-code || (git add . && git commit -m "Auto-format code using Black" && git push)
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Use GitHub token for authentication
+