diff --git a/audit-schema.iml b/audit-go.iml
similarity index 100%
rename from audit-schema.iml
rename to audit-go.iml
diff --git a/audit/api/api.go b/audit/api/api.go
index 3c44236..33550ac 100644
--- a/audit/api/api.go
+++ b/audit/api/api.go
@@ -2,10 +2,11 @@ package api
 
 import (
 	"context"
-	"github.com/google/uuid"
 	"time"
 
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
+	"github.com/google/uuid"
+
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
 
 	"google.golang.org/protobuf/proto"
 )
diff --git a/audit/api/api_common.go b/audit/api/api_common.go
index 2d44773..40991ef 100644
--- a/audit/api/api_common.go
+++ b/audit/api/api_common.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/google/uuid"
 	"strings"
 
-	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/audit/messaging"
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
+	"github.com/google/uuid"
+
+	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/audit/messaging"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
 
 	"google.golang.org/protobuf/proto"
 )
diff --git a/audit/api/api_common_test.go b/audit/api/api_common_test.go
index 5ef0343..dc683d2 100644
--- a/audit/api/api_common_test.go
+++ b/audit/api/api_common_test.go
@@ -2,14 +2,15 @@ package api
 
 import (
 	"context"
-	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/audit/messaging"
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
 	"errors"
 	"fmt"
 	"strings"
 	"testing"
 	"time"
 
+	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/audit/messaging"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
+
 	"github.com/bufbuild/protovalidate-go"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
diff --git a/audit/api/api_legacy.go b/audit/api/api_legacy.go
index 0340de7..41c120e 100644
--- a/audit/api/api_legacy.go
+++ b/audit/api/api_legacy.go
@@ -2,11 +2,12 @@ package api
 
 import (
 	"context"
-	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/audit/messaging"
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
 	"errors"
 	"fmt"
 
+	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/audit/messaging"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
+
 	"google.golang.org/protobuf/proto"
 )
 
diff --git a/audit/api/api_legacy_converter.go b/audit/api/api_legacy_converter.go
index 9b1e211..860e02d 100644
--- a/audit/api/api_legacy_converter.go
+++ b/audit/api/api_legacy_converter.go
@@ -1,13 +1,14 @@
 package api
 
 import (
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"google.golang.org/protobuf/encoding/protojson"
 	"net/url"
 	"time"
+
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 var ErrUnsupportedSeverity = errors.New("unsupported severity level")
diff --git a/audit/api/api_legacy_converter_test.go b/audit/api/api_legacy_converter_test.go
index 9284e15..64d9296 100644
--- a/audit/api/api_legacy_converter_test.go
+++ b/audit/api/api_legacy_converter_test.go
@@ -1,9 +1,10 @@
 package api
 
 import (
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_ConvertAndSerializeIntoLegacyFormat_NoObjectIdentifier(t *testing.T) {
diff --git a/audit/api/api_legacy_dynamic.go b/audit/api/api_legacy_dynamic.go
index 342d31e..c19f61a 100644
--- a/audit/api/api_legacy_dynamic.go
+++ b/audit/api/api_legacy_dynamic.go
@@ -2,11 +2,12 @@ package api
 
 import (
 	"context"
-	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/audit/messaging"
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
 	"errors"
 	"fmt"
 
+	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/audit/messaging"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
+
 	"google.golang.org/protobuf/proto"
 )
 
diff --git a/audit/api/api_legacy_dynamic_test.go b/audit/api/api_legacy_dynamic_test.go
index 253a565..553ea0e 100644
--- a/audit/api/api_legacy_dynamic_test.go
+++ b/audit/api/api_legacy_dynamic_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/audit/messaging"
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
+	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/audit/messaging"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
 
 	"github.com/bufbuild/protovalidate-go"
 	"github.com/stretchr/testify/assert"
diff --git a/audit/api/api_legacy_test.go b/audit/api/api_legacy_test.go
index e56b74b..506a6cc 100644
--- a/audit/api/api_legacy_test.go
+++ b/audit/api/api_legacy_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/audit/messaging"
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
+	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/audit/messaging"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
 
 	"github.com/Azure/go-amqp"
 	"github.com/bufbuild/protovalidate-go"
diff --git a/audit/api/api_mock.go b/audit/api/api_mock.go
index dea2508..bc5c445 100644
--- a/audit/api/api_mock.go
+++ b/audit/api/api_mock.go
@@ -3,9 +3,10 @@ package api
 import (
 	"context"
 	"fmt"
+
 	"google.golang.org/protobuf/proto"
 
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
 
 	"github.com/bufbuild/protovalidate-go"
 )
diff --git a/audit/api/api_mock_test.go b/audit/api/api_mock_test.go
index 06d6ee5..8a0184a 100644
--- a/audit/api/api_mock_test.go
+++ b/audit/api/api_mock_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/audit/api/api_routable.go b/audit/api/api_routable.go
index dc58b57..58b7245 100644
--- a/audit/api/api_routable.go
+++ b/audit/api/api_routable.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	"google.golang.org/protobuf/proto"
 
-	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/audit/messaging"
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
+	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/audit/messaging"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
 )
 
 // routableTopicNameResolver implements TopicNameResolver.
diff --git a/audit/api/api_routable_test.go b/audit/api/api_routable_test.go
index 0d0fa69..1203206 100644
--- a/audit/api/api_routable_test.go
+++ b/audit/api/api_routable_test.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/google/uuid"
 	"testing"
 	"time"
 
-	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/audit/messaging"
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
+	"github.com/google/uuid"
+
+	"dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/audit/messaging"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
 
 	"github.com/Azure/go-amqp"
 	"github.com/bufbuild/protovalidate-go"
diff --git a/audit/api/test_data.go b/audit/api/test_data.go
index 22bbc50..1130622 100644
--- a/audit/api/test_data.go
+++ b/audit/api/test_data.go
@@ -2,10 +2,11 @@ package api
 
 import (
 	"fmt"
-	"google.golang.org/protobuf/types/known/wrapperspb"
 	"time"
 
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
+	"google.golang.org/protobuf/types/known/wrapperspb"
+
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
 
 	"github.com/google/uuid"
 	"google.golang.org/protobuf/types/known/structpb"
diff --git a/audit/utils/converter.go b/audit/utils/converter.go
index 2206f38..707f383 100644
--- a/audit/utils/converter.go
+++ b/audit/utils/converter.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git/gen/go/audit/v1"
+	auditV1 "dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git/gen/go/audit/v1"
 )
 
 func StringToHttpMethod(method string) auditV1.AttributeContext_HttpMethod {
diff --git a/go.mod b/go.mod
index f30af02..a572a7d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module dev.azure.com/schwarzit/schwarzit.stackit-core-platform/common-audit.git
+module dev.azure.com/schwarzit/schwarzit.stackit-core-platform/audit-go.git
 
 go 1.22