diff --git a/Dockerfile-rpm.cloud b/Dockerfile-rpm.core
similarity index 100%
rename from Dockerfile-rpm.cloud
rename to Dockerfile-rpm.core
diff --git a/Dockerfile.cloud b/Dockerfile.core
similarity index 100%
rename from Dockerfile.cloud
rename to Dockerfile.core
diff --git a/Dockerfile.goreleaser.cloud b/Dockerfile.goreleaser.core
similarity index 100%
rename from Dockerfile.goreleaser.cloud
rename to Dockerfile.goreleaser.core
diff --git a/cmd/cloud/.ko.yaml b/cmd/core/.ko.yaml
similarity index 100%
rename from cmd/cloud/.ko.yaml
rename to cmd/core/.ko.yaml
diff --git a/cmd/cloud/main.go b/cmd/core/main.go
similarity index 92%
rename from cmd/cloud/main.go
rename to cmd/core/main.go
index 48dfb02..ed52653 100644
--- a/cmd/cloud/main.go
+++ b/cmd/core/main.go
@@ -21,8 +21,8 @@ import (
 	"flag"
 	"log"
 
-	"github.com/carverauto/serviceradar/pkg/cloud"
-	"github.com/carverauto/serviceradar/pkg/cloud/api"
+	"github.com/carverauto/serviceradar/pkg/core"
+	"github.com/carverauto/serviceradar/pkg/core/api"
 	"github.com/carverauto/serviceradar/pkg/grpc"
 	"github.com/carverauto/serviceradar/pkg/lifecycle"
 	"github.com/carverauto/serviceradar/proto"
@@ -40,7 +40,7 @@ func run() error {
 	flag.Parse()
 
 	// Load configuration
-	cfg, err := cloud.LoadConfig(*configPath)
+	cfg, err := core.LoadConfig(*configPath)
 	if err != nil {
 		return err
 	}
@@ -49,7 +49,7 @@ func run() error {
 	ctx := context.Background()
 
 	// Create cloud server
-	server, err := cloud.NewServer(ctx, &cfg)
+	server, err := core.NewServer(ctx, &cfg)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cloud/alerts/discord.go b/pkg/core/alerts/discord.go
similarity index 100%
rename from pkg/cloud/alerts/discord.go
rename to pkg/core/alerts/discord.go
diff --git a/pkg/cloud/alerts/interfaces.go b/pkg/core/alerts/interfaces.go
similarity index 100%
rename from pkg/cloud/alerts/interfaces.go
rename to pkg/core/alerts/interfaces.go
diff --git a/pkg/cloud/alerts/mock_alerts.go b/pkg/core/alerts/mock_alerts.go
similarity index 100%
rename from pkg/cloud/alerts/mock_alerts.go
rename to pkg/core/alerts/mock_alerts.go
diff --git a/pkg/cloud/alerts/webhook.go b/pkg/core/alerts/webhook.go
similarity index 100%
rename from pkg/cloud/alerts/webhook.go
rename to pkg/core/alerts/webhook.go
diff --git a/pkg/cloud/api/interfaces.go b/pkg/core/api/interfaces.go
similarity index 100%
rename from pkg/cloud/api/interfaces.go
rename to pkg/core/api/interfaces.go
diff --git a/pkg/cloud/api/mock_api_server.go b/pkg/core/api/mock_api_server.go
similarity index 100%
rename from pkg/cloud/api/mock_api_server.go
rename to pkg/core/api/mock_api_server.go
diff --git a/pkg/cloud/api/server.go b/pkg/core/api/server.go
similarity index 100%
rename from pkg/cloud/api/server.go
rename to pkg/core/api/server.go
diff --git a/pkg/cloud/api/types.go b/pkg/core/api/types.go
similarity index 100%
rename from pkg/cloud/api/types.go
rename to pkg/core/api/types.go
diff --git a/pkg/cloud/errors.go b/pkg/core/errors.go
similarity index 98%
rename from pkg/cloud/errors.go
rename to pkg/core/errors.go
index 0b35313..e0a7776 100644
--- a/pkg/cloud/errors.go
+++ b/pkg/core/errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cloud
+package core
 
 import "errors"
 
diff --git a/pkg/cloud/interfaces.go b/pkg/core/interfaces.go
similarity index 99%
rename from pkg/cloud/interfaces.go
rename to pkg/core/interfaces.go
index e88a2b1..6aa6950 100644
--- a/pkg/cloud/interfaces.go
+++ b/pkg/core/interfaces.go
@@ -18,7 +18,7 @@
 
 //go:generate mockgen -destination=mock_server.go -package=cloud github.com/carverauto/serviceradar/pkg/cloud NodeService,CloudService
 
-package cloud
+package core
 
 import (
 	"context"
diff --git a/pkg/cloud/mock_server.go b/pkg/core/mock_server.go
similarity index 99%
rename from pkg/cloud/mock_server.go
rename to pkg/core/mock_server.go
index ce8b4af..3a78d59 100644
--- a/pkg/cloud/mock_server.go
+++ b/pkg/core/mock_server.go
@@ -7,7 +7,7 @@
 //
 
 // Package cloud is a generated GoMock package.
-package cloud
+package core
 
 import (
 	context "context"
diff --git a/pkg/cloud/node_recovery.go b/pkg/core/node_recovery.go
similarity index 99%
rename from pkg/cloud/node_recovery.go
rename to pkg/core/node_recovery.go
index 1674b64..ce0ddad 100644
--- a/pkg/cloud/node_recovery.go
+++ b/pkg/core/node_recovery.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cloud
+package core
 
 import (
 	"context"
diff --git a/pkg/cloud/node_recovery_test.go b/pkg/core/node_recovery_test.go
similarity index 99%
rename from pkg/cloud/node_recovery_test.go
rename to pkg/core/node_recovery_test.go
index 98e0de3..da6b35d 100644
--- a/pkg/cloud/node_recovery_test.go
+++ b/pkg/core/node_recovery_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cloud
+package core
 
 import (
 	"context"
diff --git a/pkg/cloud/server.go b/pkg/core/server.go
similarity index 99%
rename from pkg/cloud/server.go
rename to pkg/core/server.go
index f2669ec..39faa94 100644
--- a/pkg/cloud/server.go
+++ b/pkg/core/server.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cloud
+package core
 
 import (
 	"context"
diff --git a/pkg/cloud/server_test.go b/pkg/core/server_test.go
similarity index 99%
rename from pkg/cloud/server_test.go
rename to pkg/core/server_test.go
index 5553e18..dd431a3 100644
--- a/pkg/cloud/server_test.go
+++ b/pkg/core/server_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cloud
+package core
 
 import (
 	"encoding/json"
diff --git a/pkg/cloud/types.go b/pkg/core/types.go
similarity index 99%
rename from pkg/cloud/types.go
rename to pkg/core/types.go
index c0ab8c4..da1145a 100644
--- a/pkg/cloud/types.go
+++ b/pkg/core/types.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cloud
+package core
 
 import (
 	"sync"