diff --git a/src/main/java/de/ozgcloud/admin/organisationseinheit/SyncService.java b/src/main/java/de/ozgcloud/admin/organisationseinheit/SyncService.java
index 2e8cf4bf5c2bc97711782f5915dbdbbf248fe78e..e8c5a9ec12bf4c08076314dd6fb9e00b059edefe 100644
--- a/src/main/java/de/ozgcloud/admin/organisationseinheit/SyncService.java
+++ b/src/main/java/de/ozgcloud/admin/organisationseinheit/SyncService.java
@@ -90,12 +90,12 @@ class SyncService {
 
 	public void syncAddedOrganisationsEinheiten(long syncTimestamp) {
 		repository.findAllWithoutSyncResult().forEach(
-				organisationsEinheit -> syncAddedOrganisationsEinheit(syncTimestamp, organisationsEinheit));
+				organisationsEinheit -> syncAddedOrganisationsEinheit(organisationsEinheit, syncTimestamp));
 	}
 
-	void syncAddedOrganisationsEinheit(long syncTimestamp, OrganisationsEinheit organisationsEinheit) {
+	void syncAddedOrganisationsEinheit(OrganisationsEinheit organisationsEinheit, long syncTimestamp) {
 		addAsGroupInKeycloak(organisationsEinheit).ifPresent(
-				addedGroupId -> updateAfterSuccessfulGroupCreation(organisationsEinheit, syncTimestamp, addedGroupId));
+				addedGroupId -> updateAfterSuccessfulGroupCreation(organisationsEinheit, addedGroupId, syncTimestamp));
 	}
 
 	Optional<String> addAsGroupInKeycloak(OrganisationsEinheit organisationsEinheit) {
@@ -106,7 +106,7 @@ class SyncService {
 		return addGroupInKeycloak(addGroupData);
 	}
 
-	void updateAfterSuccessfulGroupCreation(OrganisationsEinheit organisationsEinheit, long syncTimestamp, String keycloakId) {
+	void updateAfterSuccessfulGroupCreation(OrganisationsEinheit organisationsEinheit, String keycloakId, long syncTimestamp) {
 		var updatedOrganisationsEinheit = organisationsEinheit.toBuilder()
 				.keycloakId(keycloakId)
 				.syncResult(SyncResult.OK)
diff --git a/src/test/java/de/ozgcloud/admin/organisationseinheit/SyncServiceTest.java b/src/test/java/de/ozgcloud/admin/organisationseinheit/SyncServiceTest.java
index fdba7d25b7d584197570e316becd1297584114c3..8208bcef2381378656844cdcac5e81d395c28bce 100644
--- a/src/test/java/de/ozgcloud/admin/organisationseinheit/SyncServiceTest.java
+++ b/src/test/java/de/ozgcloud/admin/organisationseinheit/SyncServiceTest.java
@@ -450,7 +450,7 @@ class SyncServiceTest {
 		@BeforeEach
 		void setUp() {
 			when(repository.findAllWithoutSyncResult()).thenReturn(Stream.of(organisationsEinheiten));
-			doNothing().when(service).syncAddedOrganisationsEinheit(anyLong(), any());
+			doNothing().when(service).syncAddedOrganisationsEinheit(any(), anyLong());
 		}
 
 		@Test
@@ -464,14 +464,14 @@ class SyncServiceTest {
 		void shouldSynchronizeFirstOrganisationsEinheit() {
 			callService();
 
-			verify(service).syncAddedOrganisationsEinheit(syncTimestamp, withoutSyncResult1);
+			verify(service).syncAddedOrganisationsEinheit(withoutSyncResult1, syncTimestamp);
 		}
 
 		@Test
 		void shouldSynchronizeSecondOrganisationsEinheit() {
 			callService();
 
-			verify(service).syncAddedOrganisationsEinheit(syncTimestamp, withoutSyncResult2);
+			verify(service).syncAddedOrganisationsEinheit(withoutSyncResult2, syncTimestamp);
 		}
 
 		private void callService() {
@@ -499,11 +499,11 @@ class SyncServiceTest {
 		@Test
 		void shouldUpdateAfterSuccessfulGroupCreation() {
 			doReturn(Optional.of(addedGroupId)).when(service).addAsGroupInKeycloak(organisationsEinheit);
-			doNothing().when(service).updateAfterSuccessfulGroupCreation(organisationsEinheit, syncTimestamp, addedGroupId);
+			doNothing().when(service).updateAfterSuccessfulGroupCreation(organisationsEinheit, addedGroupId, syncTimestamp);
 
 			callService();
 
-			verify(service).updateAfterSuccessfulGroupCreation(organisationsEinheit, syncTimestamp, addedGroupId);
+			verify(service).updateAfterSuccessfulGroupCreation(organisationsEinheit, addedGroupId, syncTimestamp);
 		}
 
 		@Test
@@ -512,11 +512,11 @@ class SyncServiceTest {
 
 			callService();
 
-			verify(service, never()).updateAfterSuccessfulGroupCreation(any(), anyLong(), any());
+			verify(service, never()).updateAfterSuccessfulGroupCreation(any(), any(), anyLong());
 		}
 
 		private void callService() {
-			service.syncAddedOrganisationsEinheit(syncTimestamp, organisationsEinheit);
+			service.syncAddedOrganisationsEinheit(organisationsEinheit, syncTimestamp);
 		}
 	}
 
@@ -591,7 +591,7 @@ class SyncServiceTest {
 
 		@Test
 		void shouldSaveUpdatedOrganisationsEinheit() {
-			service.updateAfterSuccessfulGroupCreation(organisationsEinheit, syncTimestamp, keycloakId);
+			service.updateAfterSuccessfulGroupCreation(organisationsEinheit, keycloakId, syncTimestamp);
 
 			verify(repository).save(organisationsEinheitArgumentCaptor.capture());
 			assertThat(organisationsEinheitArgumentCaptor.getValue())