diff --git a/.github/workflows/autorebuilddb.yml b/.github/workflows/autorebuilddb.yml
deleted file mode 100644
index 7a3121b..0000000
--- a/.github/workflows/autorebuilddb.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Automatic rebuild of the db
-on: push
-
-jobs:
-  run:
-    name: Rebuild db
-    runs-on: ubuntu-latest
-    steps:
-       - name: Checkout repo
-         uses: actions/checkout@v4
-	 with:
- 	   fetch-depth: 0
-       
-       - name: Rebuilding DB     
-	 run: ./mkall
-		
-       - name: Commit Changes
-	 uses: actions/checkout@v4
- 	 run: |
-            date > generated.txt
-            git config user.name github-actions
-            git config user.email github-actions@github.com
-            git add -A
-            git commit -m "Rebuilded Automatically DB"
-            git push
diff --git a/.github/workflows/build-db.yaml b/.github/workflows/build-db.yaml
new file mode 100644
index 0000000..894a5f1
--- /dev/null
+++ b/.github/workflows/build-db.yaml
@@ -0,0 +1,27 @@
+name: Automatic rebuild of the db
+on: push
+
+jobs:
+  run:
+    name: Rebuild db
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          
+      - name: Build
+        run: ./mkall
+
+      - name: Configure GitHub Authentication
+        run: |
+          git config user.name "github-actions"
+          git config user.email "github-actions@github.com"
+        
+      - name: Commit and push changes
+        run: |
+          date > generated.txt
+          git add -A
+          git commit -m "Rebuilt Automatically DB"
+          git push
diff --git a/.github/workflows/check-pkg.yml b/.github/workflows/check-pkg.yml
new file mode 100644
index 0000000..e2baba7
--- /dev/null
+++ b/.github/workflows/check-pkg.yml
@@ -0,0 +1,29 @@
+name: OUR .ecmp file check CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+
+jobs:
+  build:
+
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install libcurl
+      run: sudo apt-get install libcurl4-gnutls-dev -y
+      
+    - name: configure libspm
+      run: |
+        git clone https://github.com/Soviet-Linux/libspm --recurse-submodules 
+        make -C libspm all 
+        make -C libspm test 
+        sudo make -C libspm install
+    - name: Try .ecmp files
+      run: |
+        find -name "*.ecmp" -exec sh -c './libspm/bin/package-test "$1" || exit 255' _ {} \;
diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml
deleted file mode 100644
index 5455669..0000000
--- a/.github/workflows/ourcustomci.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: OUR .ecmp file check CI
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-
-jobs:
-  build:
-
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Install libcurl
-      run: sudo apt-get install libcurl4-gnutls-dev -y
-    - name: configure libspm
-      run: git clone https://github.com/Soviet-Linux/libspm && cd libspm && make all && make formats && make test && sudo make install
-    - name: Try .ecmp files
-      run: ./bin/spm-test install ../testing/src/*.ecmp && ./bin/spm-test install ../lxde/src/*.ecmp && ./bin/spm-test install ../xorg/src/*.ecmp && ./bin/spm-test install ../xfce/src/*.ecmp && ./bin/spm-test install ../kde/src/*.ecmp && ./bin/spm-test install ../base/src/*.ecmp
\ No newline at end of file