diff --git a/osa_toolkit/filesystem.py b/osa_toolkit/filesystem.py
index 414099b73a..083feb0913 100644
--- a/osa_toolkit/filesystem.py
+++ b/osa_toolkit/filesystem.py
@@ -182,7 +182,7 @@ def _get_backup_name(basename):
     :return: a name for a backup file based on current time
     """
 
-    utctime = datetime.datetime.utcnow()
+    utctime = datetime.datetime.now(datetime.UTC)
     utctime = utctime.strftime("%Y%m%d_%H%M%S")
     return '{}-{}.json'.format(basename, utctime)
 
diff --git a/scripts/pw-token-gen.py b/scripts/pw-token-gen.py
index 6b30095f68..024bfdd45c 100755
--- a/scripts/pw-token-gen.py
+++ b/scripts/pw-token-gen.py
@@ -192,7 +192,7 @@ def main():
             os.chmod(user_vars_tar_file, 0o600)
             basename = os.path.basename(user_vars_file)
             # Time stamp the password file in UTC
-            utctime = datetime.datetime.utcnow()
+            utctime = datetime.datetime.now(datetime.UTC)
             utctime = utctime.strftime('%Y%m%d_%H%M%S')
             backup_name = '%s-%s' % (basename, utctime)
             tar.add(user_vars_file, arcname=backup_name)