diff --git a/app/lib/composegenerator/shared/const.py b/app/lib/composegenerator/shared/const.py
index 4e287d3..0a5d88a 100644
--- a/app/lib/composegenerator/shared/const.py
+++ b/app/lib/composegenerator/shared/const.py
@@ -15,14 +15,6 @@ def permissions():
                 '${LND_DATA_DIR}:/lnd:ro'
             ]
         },
-        "c-lightning": {
-            "environment_allow": [
-                "C_LIGHTNING_IP"
-            ],
-            "volumes": [
-                '${C_LIGHTNING_DATA_DIR}:/c-lightning:ro'
-            ]
-        },
         "bitcoind": {
             "environment_allow": [
                 "BITCOIN_IP",
@@ -52,7 +44,9 @@ def permissions():
             "environment_allow": [
                 "C_LIGHTNING_IP"
             ],
-            "volumes": []
+            "volumes": [
+                '${C_LIGHTNING_DATA_DIR}:/c-lightning:ro'
+            ]
         },
     }
 
diff --git a/app/lib/composegenerator/v3/generate.py b/app/lib/composegenerator/v3/generate.py
index aeb8d8a..9939923 100644
--- a/app/lib/composegenerator/v3/generate.py
+++ b/app/lib/composegenerator/v3/generate.py
@@ -65,12 +65,12 @@ def convertDataDirToVolumeGen3(app: App) -> AppStage2:
                     container.volumes.append('${BITCOIN_DATA_DIR}:' + container.mounts.bitcoin)
             if container.mounts.c_lightning:
                 if not 'c-lightning' in app.metadata.dependencies:
-                    print("Warning: container {} of app {} defines lnd mount dir but doesn't request lnd permission".format(container.name, app.metadata.name))
+                    print("Warning: container {} of app {} defines c-lightning mount dir but doesn't request c-lightning permission".format(container.name, app.metadata.name))
                     # Skip this container
                     continue
                 # Also skip the container if container.lnd_mount_dir contains a :
                 if container.mounts.c_lightning.find(":") == -1:
-                    container.volumes.append('${C_LIGHTNING_DATA_DIR}:' + container.mounts.bitcoin)
+                    container.volumes.append('${C_LIGHTNING_DATA_DIR}:' + container.mounts.c_lightning)
             del container.mounts                
     return app
 
@@ -81,7 +81,7 @@ def createComposeConfigFromV3(app: dict, nodeRoot: str):
     newApp: App = generateApp(app)
     for container in newApp.containers:
         # TODO: Make this dynamic and not hardcoded
-        if container.requires and "c-lightning" in container.requires:
+        if container.requires and "lnd" in container.requires:
             ignoredContainers.append(container.name)
             container.ignored = True
         elif container.requires:
diff --git a/docker-compose.yml b/docker-compose.yml
index 604601f..3f92b6b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -227,7 +227,7 @@ services:
         ipv4_address: $ELECTRUM_IP
   c-lightning:
     container_name: c-lightning
-    image: ghcr.io/runcitadel/c-lightning:main@sha256:ce7c30c858047c75ed13e88fda2d731db44627d6b238ad17c46cbef0c09aa67c
+    image: ghcr.io/runcitadel/core-ln:main@sha256:827264070bb07b74d695ca8e6505a241c1a8fbbef84b7a88cdee258811eb3112
     environment:
       LIGHTNINGD_NETWORK: bitcoin
       CL_REST_STATE_DIR: /data/.lightning