diff --git a/metadata/com.fairphone.clock.txt b/metadata/com.fairphone.clock.txt
index c67ce8f6e1..e3106b4cb4 100644
--- a/metadata/com.fairphone.clock.txt
+++ b/metadata/com.fairphone.clock.txt
@@ -4,9 +4,15 @@ Web Site:
 Source Code:https://github.com/WeAreFairphone/android_packages_apps_ClockWidget
 Issue Tracker:https://github.com/WeAreFairphone/android_packages_apps_ClockWidget/issues
 
+Name:Clock widget (legacy)
 Auto Name:Clock widget
 Summary:Add Fairphone clock widget to your homescreen
 Description:
+''''DEPRECATION NOTICE'''
+
+The app's development continues in [[community.fairphone.clock]], no further
+updates will be available. The old app will be moved to the archive.
+
 The interactive clock on the phone's lock screen is another function to create
 more awareness when you use your phone. You can cycle through the clock by
 tapping on it, and it will show different data, for example:
@@ -28,7 +34,13 @@ Build:2.0,2
     gradle=yes
     prebuild=sed -i -e '/proguardFiles/d' -e '/minifyEnabled/s/true/false/' -e '/shrinkResources/s/true/false/' build.gradle
 
+Build:2.0,3
+    commit=1.0.0
+    gradle=yes
+    forcevercode=yes
+    prebuild=sed -i -e '/proguardFiles/d' -e '/minifyEnabled/s/true/false/' -e '/shrinkResources/s/true/false/' build.gradle
+
 Auto Update Mode:None
-Update Check Mode:Tags [0-9.]*$
+Update Check Mode:Static
 Current Version:2.0
-Current Version Code:2
+Current Version Code:3
diff --git a/metadata/community.fairphone.clock.txt b/metadata/community.fairphone.clock.txt
new file mode 100644
index 0000000000..41a5fb8d47
--- /dev/null
+++ b/metadata/community.fairphone.clock.txt
@@ -0,0 +1,34 @@
+Categories:System
+License:Apache-2.0
+Web Site:
+Source Code:https://github.com/WeAreFairphone/android_packages_apps_ClockWidget
+Issue Tracker:https://github.com/WeAreFairphone/android_packages_apps_ClockWidget/issues
+
+Auto Name:Clock widget
+Summary:Add Fairphone clock widget to your homescreen
+Description:
+The interactive clock on the phone's lock screen is another function to create
+more awareness when you use your phone. You can cycle through the clock by
+tapping on it, and it will show different data, for example:
+
+* how long you own your Fairphone (this data is pulled from the motherboard manufacturer date)
+* until what time the battery will last
+* the amount of time you've had 'peace of mind' (based on Android's "no interruptions" setting).
+
+If you want to, you can easily share this information with others by pressing
+the Share button. So now you can brag about how long you’ve been a proud
+Fairphone owner to all your friends!
+.
+
+Repo Type:git
+Repo:https://github.com/WeAreFairphone/android_packages_apps_ClockWidget
+
+Build:2.0,2
+    commit=2.0.0
+    gradle=yes
+    prebuild=sed -i -e '/proguardFiles/d' -e '/minifyEnabled/s/true/false/' -e '/shrinkResources/s/true/false/' build.gradle
+
+Auto Update Mode:None
+Update Check Mode:Tags [0-9.]*$
+Current Version:2.0
+Current Version Code:2