diff --git a/src/cli/cli.h b/src/cli/cli.h
index 12b01a6..273fd15 100644
--- a/src/cli/cli.h
+++ b/src/cli/cli.h
@@ -19,6 +19,12 @@
     break;                                                                     \
   }
 
+#define OPTION_WITH_ARG(opt, func, arg)                                        \
+  case opt: {                                                                  \
+    func(arg);                                                                 \
+    break;                                                                     \
+  }
+
 void cli_print_help();
 void cli_print_version();
 
diff --git a/src/cli/command/push.c b/src/cli/command/push.c
index ada8732..751e6ab 100644
--- a/src/cli/command/push.c
+++ b/src/cli/command/push.c
@@ -1,10 +1,12 @@
 #include "../../config.h"
+#include "../cli.h"
 #include <linux/limits.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 char *get_current_branch_name() {
   FILE *file_ptr;
@@ -29,19 +31,23 @@ char *get_current_branch_name() {
   return branch;
 }
 
-int git_push(char *provider_name, char *branch_name, bool verbose) {
+int git_push(char *provider_name, char *branch_name, bool tags, bool verbose) {
   FILE *file_ptr;
   char output[1024];
   char command[256];
 
-  char push_option[50] = "";
-  if (strcmp(provider_name, "sourcehut") == 0) {
-    strcat(push_option, " -o skip-ci");
-  } else if (strcmp(provider_name, "gitlab") == 0) {
-    strcat(push_option, " -o ci.skip");
+  char push_args[50] = "";
+  if (tags) {
+    strcat(push_args, " --tags");
+  } else {
+    if (strcmp(provider_name, "sourcehut") == 0) {
+      strcat(push_args, " -o skip-ci");
+    } else if (strcmp(provider_name, "gitlab") == 0) {
+      strcat(push_args, " -o ci.skip");
+    }
   }
 
-  snprintf(command, sizeof(command), "git push%s gimi-%s %s 2>&1", push_option,
+  snprintf(command, sizeof(command), "git push%s gimi-%s %s 2>&1", push_args,
            provider_name, branch_name);
 
   file_ptr = popen(command, "r");
@@ -60,18 +66,26 @@ int git_push(char *provider_name, char *branch_name, bool verbose) {
   return ret;
 }
 
+void set_verbose(bool *verbose) { *verbose = true; }
+void set_tags(bool *tags) { *tags = true; }
+
 int cli_command_push(int argc, char **argv) {
   struct gimi_config *cfg = config_read();
   ASSERT_CONFIG_EXIST(cfg);
 
-  bool verbose = argc == 2 && strcmp(argv[1], "--verbose") == 0;
+  bool tags = false;
+  bool verbose = false;
+
+  HANDLE_OPTIONS(argc, argv, "tv",
+                 OPTION_WITH_ARG('t', set_tags, &tags)
+                     OPTION_WITH_ARG('v', set_verbose, &verbose))
 
   char *branch_name = get_current_branch_name();
 
   for (int i = 0; i < cfg->providers_size; i++) {
     struct gimi_config_provider *provider = cfg->providers[i];
 
-    int ret = git_push(provider->name, branch_name, verbose);
+    int ret = git_push(provider->name, branch_name, tags, verbose);
     if (ret != 0) {
       printf("error: failed to push into '%s' with git's exit code %d.\n",
              provider->name, ret);