diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7a44556..a01b9db 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -38,6 +38,7 @@ android {
     }
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
 }
 
diff --git a/app/src/main/java/net/ardevd/tagius/features/settings/ui/SettingsBottomSheet.kt b/app/src/main/java/net/ardevd/tagius/features/settings/ui/SettingsBottomSheet.kt
index 291bd51..39d55f2 100644
--- a/app/src/main/java/net/ardevd/tagius/features/settings/ui/SettingsBottomSheet.kt
+++ b/app/src/main/java/net/ardevd/tagius/features/settings/ui/SettingsBottomSheet.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import net.ardevd.tagius.BuildConfig
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.coroutines.flow.first
@@ -26,6 +27,10 @@ class SettingsBottomSheet(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        // Show version info
+        val version = BuildConfig.VERSION_NAME
+        binding.versionText.text = "v$version"
+
         // Display the stored URL so the user knows which server they are on
         viewLifecycleOwner.lifecycleScope.launch {
             val url = TokenManager(requireContext()).serverUrlFlow.first()
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index fd75b09..3cd76e9 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingBottom="32dp">
@@ -16,9 +16,9 @@
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:text="@string/settings_account_settings"
         android:textAppearance="?attr/textAppearanceHeadlineSmall"
-        android:layout_marginStart="24dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dragHandle" />
 
@@ -49,12 +49,12 @@
                 android:id="@+id/serverUrlText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="https://timetagger.app"
-                android:textAppearance="?attr/textAppearanceBodyLarge"
-                android:textStyle="bold"
                 android:layout_marginTop="4dp"
                 android:ellipsize="end"
-                android:maxLines="1" />
+                android:maxLines="1"
+                android:text="@string/login_server_url_default"
+                android:textAppearance="?attr/textAppearanceBodyLarge"
+                android:textStyle="bold" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 
@@ -67,7 +67,19 @@
         android:layout_marginTop="32dp"
         android:text="@string/settings_log_out"
         app:icon="@drawable/ic_logout"
-        app:layout_constraintTop_toBottomOf="@id/serverCard"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/serverCard" />
+
+    <TextView
+        android:id="@+id/versionText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:textAppearance="?attr/textAppearanceBodySmall"
+        android:textColor="?attr/colorOutline"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/logoutButton"
+        tools:text="v1.0.0" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file