diff --git a/src/main/java/com/j9/bestmoments/controller/MyVideoController.java b/src/main/java/com/j9/bestmoments/controller/MyVideoController.java
index cf93358..f48a193 100644
--- a/src/main/java/com/j9/bestmoments/controller/MyVideoController.java
+++ b/src/main/java/com/j9/bestmoments/controller/MyVideoController.java
@@ -12,6 +12,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -100,4 +101,21 @@ public ResponseEntity<Page<VideoPreviewDto>> findDeletedVideos(Pageable pageable
         return ResponseEntity.ok(videos.map(VideoPreviewDto::of));
     }
 
+    @Operation(summary = "태그 수정")
+    @PostMapping("/{videoId}/tags")
+    public ResponseEntity<?> findAllByTag(@PathVariable UUID videoId, @RequestBody List<String> tags) {
+        UUID memberId = UUID.fromString(SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString());
+        Video video = videoService.findByIdAndUploaderId(videoId, memberId);
+        videoService.setVideoTags(video, tags);
+        return ResponseEntity.ok(null);
+    }
+
+    @Operation(summary = "태그로 동영상 목록 조회")
+    @GetMapping("/tags/{tag}")
+    public ResponseEntity<Page<VideoPreviewDto>> findAllByTag(@PathVariable String tag, Pageable pageable) {
+        UUID memberId = UUID.fromString(SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString());
+        Page<Video> videos = videoService.findAllByUploaderAndTag(memberId, tag, pageable);
+        return ResponseEntity.ok(videos.map(VideoPreviewDto::of));
+    }
+
 }
diff --git a/src/main/java/com/j9/bestmoments/controller/VideoController.java b/src/main/java/com/j9/bestmoments/controller/VideoController.java
index e2332a1..f1107ae 100644
--- a/src/main/java/com/j9/bestmoments/controller/VideoController.java
+++ b/src/main/java/com/j9/bestmoments/controller/VideoController.java
@@ -31,11 +31,18 @@ public ResponseEntity<VideoFindDto> view(@PathVariable UUID videoId) {
         return ResponseEntity.ok(VideoFindDto.of(video));
     }
 
-    @Operation(summary = "사용자의 동영상 목록 조회")
+    @Operation(summary = "게시자로 동영상 목록 조회")
     @GetMapping("/by/{memberId}")
     public ResponseEntity<Page<VideoPreviewDto>> findAllByUploaderId(@PathVariable UUID memberId, Pageable pageable) {
         Page<Video> videos = videoService.findAllPublicByUploaderId(memberId, pageable);
         return ResponseEntity.ok(videos.map(VideoPreviewDto::of));
     }
 
+    @Operation(summary = "태그로 동영상 목록 조회")
+    @GetMapping("/tags/{tag}")
+    public ResponseEntity<Page<VideoPreviewDto>> findAllByTag(@PathVariable String tag, Pageable pageable) {
+        Page<Video> videos = videoService.findAllPublicByTag(tag, pageable);
+        return ResponseEntity.ok(videos.map(VideoPreviewDto::of));
+    }
+
 }
diff --git a/src/main/java/com/j9/bestmoments/domain/Video.java b/src/main/java/com/j9/bestmoments/domain/Video.java
index 70a3549..f796004 100644
--- a/src/main/java/com/j9/bestmoments/domain/Video.java
+++ b/src/main/java/com/j9/bestmoments/domain/Video.java
@@ -1,6 +1,7 @@
 package com.j9.bestmoments.domain;
 
 import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.EnumType;
@@ -11,6 +12,8 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
@@ -49,6 +52,9 @@ public class Video {
     private LocalDateTime createdAt;
     private LocalDateTime deletedAt;
 
+    @ElementCollection
+    private List<String> tags = new ArrayList<>();
+
     @Builder
     public Video(Member uploader, String fileUrl, String title, String description, VideoStatus videoStatus) {
         this.uploader = uploader;
@@ -78,4 +84,8 @@ public void setVideoStatus(VideoStatus videoStatus) {
         this.videoStatus = videoStatus;
     }
 
+    public void setVideoTags(List<String> tags) {
+        this.tags = tags;
+    }
+
 }
diff --git a/src/main/java/com/j9/bestmoments/repository/VideoRepository.java b/src/main/java/com/j9/bestmoments/repository/VideoRepository.java
index 4b1af76..5804d02 100644
--- a/src/main/java/com/j9/bestmoments/repository/VideoRepository.java
+++ b/src/main/java/com/j9/bestmoments/repository/VideoRepository.java
@@ -24,4 +24,8 @@ public interface VideoRepository extends JpaRepository<Video, UUID> {
 
     Optional<Video> findByIdAndUploaderId(UUID id, UUID uploaderId);
 
+    Page<Video> findAllByTagsContainsAndVideoStatusAndDeletedAtIsNull(String tag, VideoStatus videoStatus, PageRequest pageRequest);
+
+    Page<Video> findAllByUploaderIdAndTagsContainsAndDeletedAtIsNull(UUID uploaderId, String tag, PageRequest pageRequest);
+
 }
diff --git a/src/main/java/com/j9/bestmoments/service/VideoService.java b/src/main/java/com/j9/bestmoments/service/VideoService.java
index 6b9c6c8..8a865a5 100644
--- a/src/main/java/com/j9/bestmoments/service/VideoService.java
+++ b/src/main/java/com/j9/bestmoments/service/VideoService.java
@@ -9,6 +9,7 @@
 import com.j9.bestmoments.repository.VideoRepository;
 import jakarta.persistence.EntityNotFoundException;
 import jakarta.security.auth.message.AuthException;
+import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -91,6 +92,12 @@ public Video restore(Video video) {
         return video;
     }
 
+    @Transactional
+    public void setVideoTags(Video video, List<String> tags) {
+        video.setVideoTags(tags);
+        videoRepository.save(video);
+    }
+
     public Page<Video> findAllActivatedByUploaderId(UUID memberId, Pageable pageable) {
         return videoRepository.findAllByUploaderIdAndDeletedAtIsNull(
                 memberId,
@@ -113,4 +120,20 @@ public Page<Video> findAllPublicByUploaderId(UUID memberId, Pageable pageable) {
         );
     }
 
+    public Page<Video> findAllPublicByTag(String tag, Pageable pageable) {
+        return videoRepository.findAllByTagsContainsAndVideoStatusAndDeletedAtIsNull(
+                tag,
+                VideoStatus.PUBLIC,
+                PageRequest.of(pageable.getPageNumber(), pageable.getPageSize())
+        );
+    }
+
+    public Page<Video> findAllByUploaderAndTag(UUID memberId, String tag, Pageable pageable) {
+        return videoRepository.findAllByUploaderIdAndTagsContainsAndDeletedAtIsNull(
+                memberId,
+                tag,
+                PageRequest.of(pageable.getPageNumber(), pageable.getPageSize())
+        );
+    }
+
 }