diff --git a/.github/workflows/build-crate.yml b/.github/workflows/build-crate.yml
index 731705f1..abba3ed0 100644
--- a/.github/workflows/build-crate.yml
+++ b/.github/workflows/build-crate.yml
@@ -21,7 +21,7 @@ jobs:
         tag:
           - arch-rolling
           - centos-latest-community-latest
-          - community-current
+          - community-latest
           - debian-stable
           - ubuntu-lts
           - ""
@@ -33,7 +33,7 @@ jobs:
           - os: macos-latest
             tag: centos-latest-community-latest
           - os: macos-latest
-            tag: community-current
+            tag: community-latest
           - os: macos-latest
             tag: debian-stable
           - os: macos-latest
@@ -43,7 +43,7 @@ jobs:
           - os: windows-latest
             tag: centos-latest-community-latest
           - os: windows-latest
-            tag: community-current
+            tag: community-latest
           - os: windows-latest
             tag: debian-stable
           - os: windows-latest
diff --git a/index/si/simple_components/simple_components-4.42.0.toml b/index/si/simple_components/simple_components-4.42.0.toml
index 4ea547fe..3b8d845a 100644
--- a/index/si/simple_components/simple_components-4.42.0.toml
+++ b/index/si/simple_components/simple_components-4.42.0.toml
@@ -10,6 +10,7 @@ maintainers-logins = ["mosteo"]
 project-files = ["components.gpr", "components-connections_server.gpr", "components-connections_server-elv_max_cube.gpr", "components-connections_server-http_server.gpr", "components-connections_server-http_server-sqlite_browser.gpr", "components-connections_server-modbus.gpr", "components-connections_server-mqtt.gpr", "components-connections_server-secure.gpr", "components-connections_server-smtp.gpr", "components-gnutls.gpr", "components-ntp.gpr", "components-odbc.gpr", "components-sqlite.gpr", "strings_edit.gpr", "tables.gpr"]
 
 [[depends-on]]
+gnat = "/=2021 & <11"
 libgnutls = "^3.5.8"
 unixODBC = "^2.3"
 
@@ -31,5 +32,5 @@ arch = "i686"
 arch = "x86_64"
 
 [origin]
-url = "http://www.dmitry-kazakov.de/ada/components_4_42.tgz"
-hashes = ["sha512:d428a64b7e457d616dd402ac75f8324e7564ed42e667c8efc909079638213426232ea6d856f1080b633d5bb90dda5567073b8e66cbb55462f27ea64ff7360107"]
+url = "git+https://github.com/alire-project/dak_simple_components.git"
+commit = "21c0053074f991b615eae2d678e1d3afc6bf7a2a"
diff --git a/scripts/gh-build-crate.sh b/scripts/gh-build-crate.sh
index ff7a6ddf..9b1a1efb 100755
--- a/scripts/gh-build-crate.sh
+++ b/scripts/gh-build-crate.sh
@@ -25,6 +25,9 @@ alr version
 # Configure index
 alr index --name local --add ./index
 
+# Remove community index in case it has been added before
+alr index --del community || true
+
 # Test crate
 for file in $CHANGES; do