diff --git a/backend/src/main/java/com/codecool/solarwatch/controller/AdminController.java b/backend/src/main/java/com/codecool/solarwatch/controller/AdminController.java
index 75c9054..9126330 100644
--- a/backend/src/main/java/com/codecool/solarwatch/controller/AdminController.java
+++ b/backend/src/main/java/com/codecool/solarwatch/controller/AdminController.java
@@ -33,9 +33,9 @@ public void deleteCity(@PathVariable UUID id) {
         this.solarWatchService.deleteCity(id);
     }
 
-    @PostMapping("/sunrise-sunset")
-    public SunriseSunsetDTO createSunriseSunsetTimes(@RequestBody SunriseSunsetCreateDTO sunriseSunsetCreateDTO) {
-        return this.solarWatchService.createSunriseSunsetTimes(sunriseSunsetCreateDTO);
+    @PostMapping("/sunrise-sunset/{cityId}")
+    public SunriseSunsetDTO createSunriseSunsetTimes(@PathVariable UUID cityId, @RequestBody SunriseSunsetCreateDTO sunriseSunsetCreateDTO) {
+        return this.solarWatchService.createSunriseSunsetTimes(cityId, sunriseSunsetCreateDTO);
     }
 
     @PutMapping("/sunrise-sunset/{cityId}")
diff --git a/backend/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java b/backend/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java
index 0b49de1..31f5ccf 100644
--- a/backend/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java
+++ b/backend/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java
@@ -115,8 +115,8 @@ public void deleteCity(UUID publicId) {
      * @param sunriseSunsetCreateDTO data transfer object containing the sunrise/sunset data to create
      * @return created sunrise and sunset time data as a data transfer object
      */
-    public SunriseSunsetDTO createSunriseSunsetTimes(SunriseSunsetCreateDTO sunriseSunsetCreateDTO) {
-        City city = this.cityRepository.findByName(sunriseSunsetCreateDTO.cityName())
+    public SunriseSunsetDTO createSunriseSunsetTimes(UUID publicCityId, SunriseSunsetCreateDTO sunriseSunsetCreateDTO) {
+        City city = this.cityRepository.findByPublicId(publicCityId)
                 .orElseGet(() -> saveCityFromAPI(sunriseSunsetCreateDTO.cityName()));
         SunriseSunsetTime sunriseSunsetTime = this.sunriseSunsetTimeRepository
                 .save(new SunriseSunsetTime(sunriseSunsetCreateDTO.sunrise(),
@@ -136,8 +136,8 @@ public SunriseSunsetDTO createSunriseSunsetTimes(SunriseSunsetCreateDTO sunriseS
      * @throws NoSuchCityException          if the city does not exist
      * @throws NoSunriseSunsetDataException if the sunrise/sunset data cannot be found
      */
-    public SunriseSunsetDTO updateSunriseSunsetTimes(SunriseSunsetUpdateDTO sunriseSunsetUpdateDTO) {
-        City city = this.cityRepository.findByName(sunriseSunsetUpdateDTO.cityName())
+    public SunriseSunsetDTO updateSunriseSunsetTimes(UUID cityPublicId, SunriseSunsetUpdateDTO sunriseSunsetUpdateDTO) {
+        City city = this.cityRepository.findByPublicId(cityPublicId)
                 .orElseThrow(NoSuchCityException::new);
         SunriseSunsetTime sunriseSunsetTime = this.sunriseSunsetTimeRepository.findByCityIdAndDate(city.getId(), sunriseSunsetUpdateDTO.date())
                 .map(sunriseSunset -> {